qontract-reconcile 0.10.2.dev332__py3-none-any.whl → 0.10.2.dev334__py3-none-any.whl

{qontract_reconcile-0.10.2.dev332.dist-info → qontract_reconcile-0.10.2.dev334.dist-info}/METADATA

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

@@ -152,7 +152,7 @@ reconcile/aws_saml_idp/integration.py,sha256=rop8ahl7v0WUheSgVLb-4MU3Ldy6Eb3LknF
 reconcile/aws_saml_roles/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aws_saml_roles/integration.py,sha256=mLRCnSfClp2ia8UynSmY5HZe5YmrJTc1RwxyMeU2yBw,11319
 reconcile/aws_version_sync/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/aws_version_sync/integration.py,sha256=hB97__QCJXAd1pRGs7h1-T5SWVYqZBb2eigXYW7YO7g,20011
+reconcile/aws_version_sync/integration.py,sha256=s53FHoEFyeqGN3Mql9Fxo3wTpG7e9IIePhoA9Cbh-Gc,21364
 reconcile/aws_version_sync/utils.py,sha256=x-45QT7zAwdNvCg7w_qJNwLaksFcfz1_6KQoD_0IVuA,1727
 reconcile/aws_version_sync/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aws_version_sync/merge_request_manager/merge_request.py,sha256=2FbqLLdqxycWNvX1eNbwMjWSVBb7q0p-8t5Db0m7b4Q,4842
@@ -796,7 +796,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=uQv2QJAmUXP1g2GPIH30WTlvL9soY6m9lefpZEVDM5w,3965
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=KcYVfa3UmJHVP_ocgrKe8NkrO5IDB9aWEDydSokPcRk,975
-qontract_reconcile-0.10.2.dev332.dist-info/METADATA,sha256=hwAOcicRlD8UQ2VE8S2-LRRSpFHahqnOdNWnMfK4Zlc,24916
-qontract_reconcile-0.10.2.dev332.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev332.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev332.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev334.dist-info/METADATA,sha256=t36GOtTwC5j50jVkjdrq7IyTsg3-heBRHIfHmvzbl6I,24916
+qontract_reconcile-0.10.2.dev334.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev334.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev334.dist-info/RECORD,,

reconcile/aws_version_sync/integration.py

@@ -104,7 +104,6 @@ class ExternalResource(BaseModel):
             self.provisioner.uid,
             self.resource_provider,
             self.resource_identifier,
-            self.resource_engine,
         )
 
     @validator("resource_engine_version", pre=True)
@@ -220,6 +219,7 @@ class AVSIntegration(QontractReconcileIntegration[AVSIntegrationParams]):
         clusters: Iterable[ClusterV1],
         timeout: int,
         elasticache_replication_group_id_to_identifier: ReplicationGroupIdToIdentifier,
+        supported_providers: Iterable[str],
         prom_get_func: Callable = prom_get,
     ) -> list[ExternalResource]:
         metrics: list[ExternalResource] = []
@@ -232,81 +232,123 @@ class AVSIntegration(QontractReconcileIntegration[AVSIntegrationParams]):
             )
 
             # RDS resources
-            try:
-                rds_metrics = prom_get_func(
-                    url=cluster.prometheus_url,
-                    params={"query": "aws_resources_exporter_rds_engineversion"},
-                    token=token,
-                    timeout=timeout,
+            if SupportedResourceProvider.RDS in supported_providers:
+                metrics.extend(
+                    self._fetch_rds_metrics(cluster, token, timeout, prom_get_func)
                 )
 
-                for m in rds_metrics:
-                    try:
-                        metrics.append(
-                            ExternalResource(
-                                provider="aws",
-                                provisioner=ExternalResourceProvisioner(
-                                    uid=m["aws_account_id"]
-                                ),
-                                resource_provider=SupportedResourceProvider.RDS,
-                                resource_identifier=m["dbinstance_identifier"],
-                                resource_engine=m["engine"],
-                                resource_engine_version=m["engine_version"],
-                            )
-                        )
-                    except ValidationError:
-                        # don't try to parse AWS extended support version numbers
-                        # See https://aws.amazon.com/about-aws/whats-new/2025/04/amazon-rds-postgresql-extended-support-11-22-rds-20250220-12-22-rds-20250220/ for more info
-                        if (
-                            EXTENDED_SUPPORT_VERSION_INDICATOR
-                            not in m["engine_version"]
-                        ):
-                            raise
-                    except Exception as e:
-                        logging.error(
-                            f"Failed to parse RDS metric for {m['dbinstance_identifier']}: {e}"
-                        )
-            except Exception as e:
+            # ElastiCache resources
+            if SupportedResourceProvider.ELASTICACHE in supported_providers:
+                metrics.extend(
+                    self._fetch_elasticache_metrics(
+                        cluster,
+                        token,
+                        timeout,
+                        elasticache_replication_group_id_to_identifier,
+                        prom_get_func,
+                    )
+                )
+
+        return metrics
+
+    def _fetch_rds_metrics(
+        self,
+        cluster: ClusterV1,
+        token: str | None,
+        timeout: int,
+        prom_get_func: Callable,
+    ) -> list[ExternalResource]:
+        """Fetch RDS metrics from the AWS resource exporter."""
+        metrics: list[ExternalResource] = []
+        try:
+            rds_metrics = prom_get_func(
+                url=cluster.prometheus_url,
+                params={"query": "aws_resources_exporter_rds_engineversion"},
+                token=token,
+                timeout=timeout,
+            )
+        except Exception as e:
+            logging.error(
+                f"Failed to get 'aws_resources_exporter_rds_engineversion' metrics for cluster {cluster.name}: {e}"
+            )
+            return []
+
+        for m in rds_metrics:
+            try:
+                metrics.append(
+                    ExternalResource(
+                        provider="aws",
+                        provisioner=ExternalResourceProvisioner(
+                            uid=m["aws_account_id"]
+                        ),
+                        resource_provider=SupportedResourceProvider.RDS,
+                        resource_identifier=m["dbinstance_identifier"],
+                        resource_engine=m["engine"],
+                        resource_engine_version=m["engine_version"],
+                    )
+                )
+            except ValidationError as e:
+                if EXTENDED_SUPPORT_VERSION_INDICATOR in m["engine_version"]:
+                    # don't try to parse AWS extended support version numbers
+                    # See https://aws.amazon.com/about-aws/whats-new/2025/04/amazon-rds-postgresql-extended-support-11-22-rds-20250220-12-22-rds-20250220/ for more info
+                    pass
+                else:
+                    logging.error(
+                        f"Failed to parse RDS metric for {m['dbinstance_identifier']}: {e}"
+                    )
+            except KeyError as e:
                 logging.error(
-                    f"Failed to get 'aws_resources_exporter_rds_engineversion' metrics for cluster {cluster.name}: {e}"
+                    f"Failed to parse RDS metric for {m['dbinstance_identifier']}: {e}"
                 )
+        return metrics
 
-            # ElastiCache resources
+    def _fetch_elasticache_metrics(
+        self,
+        cluster: ClusterV1,
+        token: str | None,
+        timeout: int,
+        elasticache_replication_group_id_to_identifier: ReplicationGroupIdToIdentifier,
+        prom_get_func: Callable,
+    ) -> list[ExternalResource]:
+        """Fetch ElastiCache metrics from the AWS resource exporter."""
+        metrics: list[ExternalResource] = []
+        try:
+            elasticache_metrics = prom_get_func(
+                url=cluster.prometheus_url,
+                params={"query": "aws_resources_exporter_elasticache_redisversion"},
+                token=token,
+                timeout=timeout,
+            )
+        except Exception as e:
+            logging.error(
+                f"Failed to get 'aws_resources_exporter_elasticache_redisversion' metrics for cluster {cluster.name}: {e}"
+            )
+            return []
+
+        for m in elasticache_metrics:
             try:
-                elasticache_metrics = prom_get_func(
-                    url=cluster.prometheus_url,
-                    params={"query": "aws_resources_exporter_elasticache_redisversion"},
-                    token=token,
-                    timeout=timeout,
+                metrics.append(
+                    ExternalResource(
+                        provider="aws",
+                        provisioner=ExternalResourceProvisioner(
+                            uid=m["aws_account_id"]
+                        ),
+                        resource_provider=SupportedResourceProvider.ELASTICACHE,
+                        # replication_group_id != resource_identifier!
+                        resource_identifier=elasticache_replication_group_id_to_identifier.get(
+                            (
+                                m["aws_account_id"],
+                                m["replication_group_id"],
+                            ),
+                            m["replication_group_id"],
+                        ),
+                        resource_engine=m["engine"],
+                        resource_engine_version=m["engine_version"],
+                    )
                 )
-                for m in elasticache_metrics:
-                    try:
-                        metrics.append(
-                            ExternalResource(
-                                provider="aws",
-                                provisioner=ExternalResourceProvisioner(
-                                    uid=m["aws_account_id"]
-                                ),
-                                resource_provider=SupportedResourceProvider.ELASTICACHE,
-                                # replication_group_id != resource_identifier!
-                                resource_identifier=elasticache_replication_group_id_to_identifier.get(
-                                    (
-                                        m["aws_account_id"],
-                                        m["replication_group_id"],
-                                    ),
-                                    m["replication_group_id"],
-                                ),
-                                resource_engine=m["engine"],
-                                resource_engine_version=m["engine_version"],
-                            )
-                        )
-                    except Exception as e:
-                        logging.error(
-                            f"Failed to parse ElastiCache metrics for {m['replication_group_id']}: {e}"
-                        )
-            except Exception as e:
+            except (ValidationError, KeyError) as e:
                 logging.error(
-                    f"Failed to get 'aws_resources_exporter_elasticache_redisversion' metrics for cluster {cluster.name}: {e}"
+                    f"Failed to parse ElastiCache metrics for {m['replication_group_id']}: {e}"
                 )
 
         return metrics
@@ -353,8 +395,8 @@ class AVSIntegration(QontractReconcileIntegration[AVSIntegrationParams]):
                         resource.provider == SupportedResourceProvider.ELASTICACHE
                         and str(values["engine_version"]).lower().endswith("x")
                     ):
-                        # AWS ElastiCache Redis 6 could use a version like 6.x. Then, we don't need to manage it
-                        continue
+                        # AWS ElastiCache Redis 6 could use a version like 6.x. Let's patch it to a fix version
+                        values["engine_version"] = "6.2"
 
                     if (
                         resource.provider == SupportedResourceProvider.RDS
@@ -400,7 +442,9 @@ class AVSIntegration(QontractReconcileIntegration[AVSIntegrationParams]):
             key=lambda r: r.key,
             equal=lambda external_resources_app_interface,
             external_resources_aws: external_resources_app_interface.resource_engine_version_string
-            == external_resources_aws.resource_engine_version_string,
+            == external_resources_aws.resource_engine_version_string
+            and external_resources_app_interface.resource_engine
+            == external_resources_aws.resource_engine,
         )
         for diff_pair in diff.change.values():
             aws_resource = diff_pair.desired
@@ -408,6 +452,8 @@ class AVSIntegration(QontractReconcileIntegration[AVSIntegrationParams]):
             if (
                 aws_resource.resource_engine_version
                 <= app_interface_resource.resource_engine_version
+                and aws_resource.resource_engine
+                == app_interface_resource.resource_engine
             ):
                 # do not downgrade the version
                 continue
@@ -422,7 +468,7 @@ class AVSIntegration(QontractReconcileIntegration[AVSIntegrationParams]):
                     provisioner_uid=app_interface_resource.provisioner.uid,
                     resource_provider=app_interface_resource.resource_provider,
                     resource_identifier=app_interface_resource.resource_identifier,
-                    resource_engine=app_interface_resource.resource_engine,
+                    resource_engine=aws_resource.resource_engine,
                     resource_engine_version=aws_resource.resource_engine_version_string,
                 )
             )
@@ -475,6 +521,7 @@ class AVSIntegration(QontractReconcileIntegration[AVSIntegrationParams]):
                 for external_resource in external_resources_app_interface
                 if external_resource.redis_replication_group_id
             },
+            supported_providers=self.params.supported_providers,
         )
 
         self.reconcile(