qontract-reconcile 0.10.2.dev73__py3-none-any.whl → 0.10.2.dev74__py3-none-any.whl

{qontract_reconcile-0.10.2.dev73.dist-info → qontract_reconcile-0.10.2.dev74.dist-info}/METADATA

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

@@ -155,7 +155,7 @@ reconcile/aws_saml_idp/integration.py,sha256=Z2JtUx2YIbkn0KVrVa2CoAErPB8vTykOOkW
 reconcile/aws_saml_roles/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aws_saml_roles/integration.py,sha256=inU10Yu0lZpJw_00vVe2bytJrecjLtu2hR7kQQIAbx0,11234
 reconcile/aws_version_sync/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/aws_version_sync/integration.py,sha256=BUVUC90cNVjFPVpGKxGY9b9x-TRVHDElc0kiec_5mDA,17284
+reconcile/aws_version_sync/integration.py,sha256=7tfOZx9uY4bLcPFf0i6o9cu1Hmk9ByoGPTZ66Iv5fYQ,17885
 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
@@ -777,7 +777,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.dev73.dist-info/METADATA,sha256=Kw8mFt6cKF4tp764Q0g6r82MRSjY3jGMu7FTlJJr3k4,24565
-qontract_reconcile-0.10.2.dev73.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev73.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev73.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev74.dist-info/METADATA,sha256=TD6ZaK3hyP88I13ucRR7xu-w1np1nDqlv8Q0qRmr_II,24565
+qontract_reconcile-0.10.2.dev74.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev74.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev74.dist-info/RECORD,,

reconcile/aws_version_sync/integration.py

@@ -75,11 +75,16 @@ class VersionFormat(StrEnum):
     MAJOR_MINOR_PATCH = "major_minor_patch"
 
 
+class SupportedResourceProvider(StrEnum):
+    RDS = "rds"
+    ELASTICACHE = "elasticache"
+
+
 class ExternalResource(BaseModel):
     namespace_file: str | None = None
     provider: str = "aws"
     provisioner: ExternalResourceProvisioner
-    resource_provider: str
+    resource_provider: SupportedResourceProvider
     resource_identifier: str
     resource_engine: str
     resource_engine_version: semver.VersionInfo
@@ -133,6 +138,15 @@ class ExternalResource(BaseModel):
                     raise ValueError(
                         f"Invalid version format: {resource_engine_version}"
                     )
+        if values.get("resource_provider") == SupportedResourceProvider.ELASTICACHE:
+            if resource_engine_version.startswith("5"):
+                # AWS ElastiCache Redis 5 uses MAJOR_MINOR_PATCH format
+                values["resource_engine_version_format"] = (
+                    VersionFormat.MAJOR_MINOR_PATCH
+                )
+            else:
+                # AWS ElastiCache Redis 6+ uses MAJOR_MINOR format
+                values["resource_engine_version_format"] = VersionFormat.MAJOR_MINOR
         return values
 
     @property
@@ -222,7 +236,7 @@ class AVSIntegration(QontractReconcileIntegration[AVSIntegrationParams]):
                         provisioner=ExternalResourceProvisioner(
                             uid=m["aws_account_id"]
                         ),
-                        resource_provider="rds",
+                        resource_provider=SupportedResourceProvider.RDS,
                         resource_identifier=m["dbinstance_identifier"],
                         resource_engine=m["engine"],
                         resource_engine_version=m["engine_version"],
@@ -241,7 +255,7 @@ class AVSIntegration(QontractReconcileIntegration[AVSIntegrationParams]):
                         provisioner=ExternalResourceProvisioner(
                             uid=m["aws_account_id"]
                         ),
-                        resource_provider="elasticache",
+                        resource_provider=SupportedResourceProvider.ELASTICACHE,
                         # replication_group_id != resource_identifier!
                         resource_identifier=elasticache_replication_group_id_to_identifier.get(
                             (
@@ -304,11 +318,11 @@ class AVSIntegration(QontractReconcileIntegration[AVSIntegrationParams]):
                             )
                             defaults_cache[resource.defaults] = values
                     values = override_values(values, resource.overrides)
-                    if resource.provider.lower() == "elasticache" and str(
-                        values["engine_version"]
-                    ).lower().endswith("x"):
-                        # see https://gitlab.cee.redhat.com/service/app-interface/-/blob/master/docs/app-sre/sop/upgrade-redis-minor-version.md
-                        # minor version not managed by app-interface anymore. skip it
+                    if (
+                        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
 
                     external_resources.append(