qontract-reconcile 0.10.1rc1050__py3-none-any.whl → 0.10.1rc1052__py3-none-any.whl

{qontract_reconcile-0.10.1rc1050.dist-info → qontract_reconcile-0.10.1rc1052.dist-info}/METADATA

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

@@ -10,7 +10,7 @@ reconcile/aws_iam_password_reset.py,sha256=q96mwr2KeEQ5bpNniGlgIMZTxiuLSodcYfX-t
 reconcile/aws_support_cases_sos.py,sha256=hl_9L53yQYRQxKs3IWrd69Cc60XK067g_bJRM9B0udo,2975
 reconcile/blackbox_exporter_endpoint_monitoring.py,sha256=O1wFp52EyF538c6txaWBs8eMtUIy19gyHZ6VzJ6QXS8,3512
 reconcile/checkpoint.py,sha256=_JhMxrye5BgkRMxWYuf7Upli6XayPINKSsuo3ynHTRc,5010
-reconcile/cli.py,sha256=2Qxyuwrp90j9Pox_2px5LZDn8oomwrQuFtdY85xMBOE,107389
+reconcile/cli.py,sha256=JCKHmEpzb1MnjtyBlyRPo27J2z03J1rrQ680Nlu7_m8,106890
 reconcile/closedbox_endpoint_monitoring_base.py,sha256=rLh16BOlBOxTmJ8Si3wWyyEpmMlhh4Znx1Gc36qsmOc,4865
 reconcile/cluster_deployment_mapper.py,sha256=5gumAaRCcFXsabUJ1dnuUy9WrP_FEEM5JnOnE8ch9sE,2326
 reconcile/dashdotdb_base.py,sha256=l34QDu1G96_Ctnh7ZXdxXgSeCE93GQMdLAkWxmN6vDA,4775
@@ -181,7 +181,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=Il2DIgeeOjaVtI8A7ou4SbWCo7vpiAopwDxhn5geaEo,25691
+reconcile/dynatrace_token_provider/integration.py,sha256=Wgjv6UkMmPa8V0baHt0zk9sv5KENVeaStdIY1j7DKqE,26049
 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=66XfJact_PZoa9c8Wz0t_n8N6aSMRQpfPLgKHYtWf8s,4307
@@ -665,7 +665,7 @@ reconcile/utils/differ.py,sha256=kJmUp9ZffFPSUEviaAw3s9c92ErwRJeHaRexGPai7wA,764
 reconcile/utils/disabled_integrations.py,sha256=z1ZGUOKjZ99R-YZ68w1xnLQ_wUccI27NcmdzfK9TARs,1077
 reconcile/utils/dnsutils.py,sha256=VX4gDQXpiMYVuT0pvNbzzSgfqmsWOM2qtjNQHUyIYF8,370
 reconcile/utils/early_exit_cache.py,sha256=9zj4ksXCq2qK2oGO0zW9aZ5tkjC5sRCms0ismZOmBv4,8725
-reconcile/utils/elasticsearch_exceptions.py,sha256=UY5Z3y2hw7T73sPJ6dHmUybegiIophrKFdTfdsOa6UY,379
+reconcile/utils/elasticsearch_exceptions.py,sha256=zMuP0B8Y3U0u64ZrmAyzw2RWALPs9uS7IzKcF7Prx0U,501
 reconcile/utils/environ.py,sha256=psk07d2xyjbUzjOCDdNWgavaNolL_t2sq3sn2gFfY9k,507
 reconcile/utils/exceptions.py,sha256=DwfnWUpVOotpP79RWZ2pycmG6nKCL00RBIeZLYkQPW4,635
 reconcile/utils/expiration.py,sha256=3JaXH4psksR7z262k7FmdyREjCLqm66OpVMEbcfdWRo,1213
@@ -725,7 +725,7 @@ reconcile/utils/state.py,sha256=W0_awkLAPX18hNOF_60o73tkPxDUylqbzYNHfl_sDsk,1638
 reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,352
 reconcile/utils/template.py,sha256=wTvRU4AnAV_o042tD4Mwls2dwWMuk7MKnde3MaCjaYg,331
 reconcile/utils/terraform_client.py,sha256=jHTkqqJk1HQh2vZP1FkEeDOiMlO-SKmX8oYuS7lzO_o,34672
-reconcile/utils/terrascript_aws_client.py,sha256=eshIGXo9HQkAAANhO_mdL3a7M7A6NbMMlc8nj61k6Lk,278034
+reconcile/utils/terrascript_aws_client.py,sha256=ctNT-TQSMxNicVIjR1gM2OZWzNc_BG820COSXb_E-CE,278933
 reconcile/utils/three_way_diff_strategy.py,sha256=oQcHXd9LVhirJfoaOBoHUYuZVGfyL2voKr6KVI34zZE,4833
 reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
 reconcile/utils/vault.py,sha256=9GSNHku8tw5KM2LKpZ1myWYDLtLGUJgpSnD0DxbzeO0,14956
@@ -867,8 +867,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.1rc1050.dist-info/METADATA,sha256=jaTxzV1Ruwt2BUFyy5WMHueI5w-NoghTWsBX968vJqg,2213
-qontract_reconcile-0.10.1rc1050.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-qontract_reconcile-0.10.1rc1050.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1050.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1050.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1052.dist-info/METADATA,sha256=vApqFMxNENnXiau-v2JHl7G_NMa4KoDW4q9N9CAFcvM,2213
+qontract_reconcile-0.10.1rc1052.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+qontract_reconcile-0.10.1rc1052.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1052.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1052.dist-info/RECORD,,

reconcile/cli.py

@@ -3107,26 +3107,14 @@ def cluster_auth_rhidp(ctx):
 @integration.command(
     short_help="Automatically provide dedicated Dynatrace tokens to management clusters"
 )
-@click.option(
-    "--ocm-org-ids",
-    help="A comma seperated list of OCM organization IDs DTP should operate on. If none is specified, all organizations are considered.",
-    required=False,
-    envvar="DTP_OCM_ORG_IDS",
-)
 @click.pass_context
-def dynatrace_token_provider(ctx, ocm_org_ids):
+def dynatrace_token_provider(ctx):
     from reconcile.dynatrace_token_provider.integration import (
         DynatraceTokenProviderIntegration,
-        DynatraceTokenProviderIntegrationParams,
     )
 
-    parsed_ocm_org_ids = set(ocm_org_ids.split(",")) if ocm_org_ids else None
     run_class_integration(
-        integration=DynatraceTokenProviderIntegration(
-            DynatraceTokenProviderIntegrationParams(
-                ocm_organization_ids=parsed_ocm_org_ids,
-            )
-        ),
+        integration=DynatraceTokenProviderIntegration(),
         ctx=ctx.obj,
     )
 

reconcile/dynatrace_token_provider/integration.py

@@ -38,7 +38,7 @@ from reconcile.utils.ocm.base import (
 )
 from reconcile.utils.ocm.labels import subscription_label_filter
 from reconcile.utils.runtime.integration import (
-    PydanticRunParams,
+    NoParams,
     QontractReconcileIntegration,
 )
 
@@ -46,10 +46,6 @@ QONTRACT_INTEGRATION = "dynatrace-token-provider"
 SYNCSET_AND_MANIFEST_ID = "ext-dynatrace-tokens-dtp"
 
 
-class DynatraceTokenProviderIntegrationParams(PydanticRunParams):
-    ocm_organization_ids: set[str] | None = None
-
-
 class ReconcileErrorSummary(Exception):
     def __init__(self, exceptions: Iterable[str]) -> None:
         self.exceptions = exceptions
@@ -59,11 +55,9 @@ class ReconcileErrorSummary(Exception):
         return f"Reconcile exceptions:\n{formatted_exceptions}"
 
 
-class DynatraceTokenProviderIntegration(
-    QontractReconcileIntegration[DynatraceTokenProviderIntegrationParams]
-):
-    def __init__(self, params: DynatraceTokenProviderIntegrationParams) -> None:
-        super().__init__(params=params)
+class DynatraceTokenProviderIntegration(QontractReconcileIntegration[NoParams]):
+    def __init__(self) -> None:
+        super().__init__(NoParams())
         self._lock = Lock()
         self._managed_tokens_cnt: dict[str, Counter[str]] = defaultdict(Counter)
 
@@ -106,6 +100,27 @@ class DynatraceTokenProviderIntegration(
                     cnt,
                 )
 
+    def _filter_clusters(
+        self,
+        clusters: Iterable[Cluster],
+        token_spec_by_name: Mapping[str, DynatraceTokenProviderTokenSpecV1],
+    ) -> list[Cluster]:
+        filtered_clusters = []
+        for cluster in clusters:
+            token_spec = token_spec_by_name.get(cluster.token_spec_name)
+            if not token_spec:
+                logging.debug(
+                    f"[{cluster.external_id=}] Skipping cluster. {cluster.token_spec_name=} does not exist."
+                )
+                continue
+            if cluster.organization_id in token_spec.ocm_org_ids:
+                filtered_clusters.append(cluster)
+            else:
+                logging.debug(
+                    f"[{cluster.external_id=}] Skipping cluster for {token_spec.name=}. {cluster.organization_id=} is not defined in {token_spec.ocm_org_ids=}."
+                )
+        return filtered_clusters
+
     def reconcile(self, dry_run: bool, dependencies: Dependencies) -> None:
         token_specs = list(dependencies.token_spec_by_name.values())
         validate_token_specs(specs=token_specs)
@@ -124,12 +139,10 @@ class DynatraceTokenProviderIntegration(
                     unhandled_exceptions.append(f"{ocm_env_name}: {e}")
                 if not clusters:
                     continue
-                if self.params.ocm_organization_ids:
-                    clusters = [
-                        cluster
-                        for cluster in clusters
-                        if cluster.organization_id in self.params.ocm_organization_ids
-                    ]
+                filtered_clusters = self._filter_clusters(
+                    clusters=clusters,
+                    token_spec_by_name=dependencies.token_spec_by_name,
+                )
 
                 existing_dtp_tokens: dict[str, dict[str, str]] = {}
 
@@ -140,7 +153,7 @@ class DynatraceTokenProviderIntegration(
                     ),
                     len(clusters),
                 )
-                for cluster in clusters:
+                for cluster in filtered_clusters:
                     try:
                         with DTPOrganizationErrorRate(
                             integration=self.name,
@@ -230,11 +243,6 @@ class DynatraceTokenProviderIntegration(
         token_spec: DynatraceTokenProviderTokenSpecV1,
         ocm_env_name: str,
     ) -> None:
-        if cluster.organization_id not in token_spec.ocm_org_ids:
-            logging.info(
-                f"[{token_spec.name=}] Cluster {cluster.external_id} is not part of ocm orgs defined in {token_spec.ocm_org_ids=}"
-            )
-            return
         existing_data = {}
         if cluster.is_hcp:
             existing_data = self.get_manifest(ocm_client=ocm_client, cluster=cluster)

reconcile/utils/elasticsearch_exceptions.py

@@ -11,3 +11,8 @@ class ElasticSearchResourceMissingSubnetIdError(Exception):
 class ElasticSearchResourceZoneAwareSubnetInvalidError(Exception):
     def __init__(self, msg):
         super().__init__(str(msg))
+
+
+class ElasticSearchResourceColdStorageError(Exception):
+    def __init__(self, msg):
+        super().__init__(str(msg))

reconcile/utils/terrascript_aws_client.py

@@ -161,6 +161,7 @@ from reconcile.utils.cloud_resource_best_practice.aws_rds import (
 )
 from reconcile.utils.disabled_integrations import integration_is_enabled
 from reconcile.utils.elasticsearch_exceptions import (
+    ElasticSearchResourceColdStorageError,
     ElasticSearchResourceMissingSubnetIdError,
     ElasticSearchResourceNameInvalidError,
     ElasticSearchResourceZoneAwareSubnetInvalidError,
@@ -4632,6 +4633,24 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
             )
             cluster_vaules["warm_count"] = cluster_config.get("warm_count", 2)
 
+        cold_storage_options = cluster_config.get("cold_storage_options", {})
+        if cold_storage_options.get("enabled", False):
+            if not dedicated_master_enabled:
+                raise ElasticSearchResourceColdStorageError(
+                    f"[{account}] Cold storage can only be enabled when "
+                    + "dedicated_master_enabled is set to true for resource"
+                    f" {values['identifier']}"
+                )
+            if not warm_enabled:
+                raise ElasticSearchResourceColdStorageError(
+                    f"[{account}] Cold storage can only be enabled when "
+                    + "warm_enabled is set to true for resource"
+                    f" {values['identifier']}"
+                )
+            cluster_vaules["cold_storage_options"] = {
+                "enabled": True,
+            }
+
         es_values["cluster_config"] = cluster_vaules
 
         snapshot_options = values.get("snapshot_options", {})