qontract-reconcile 0.10.2.dev117__py3-none-any.whl → 0.10.2.dev119__py3-none-any.whl

{qontract_reconcile-0.10.2.dev117.dist-info → qontract_reconcile-0.10.2.dev119.dist-info}/METADATA

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

@@ -580,7 +580,7 @@ reconcile/unleash_feature_toggles/integration.py,sha256=nx7BhtzCsTfPbOp60vI5MkNw
 reconcile/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/aggregated_list.py,sha256=_9UeaS1TWbJsGIESvXlzzK-omPI2lMMcCsoqc9LBclc,4022
 reconcile/utils/amtool.py,sha256=3dHViQ_esKPaMEpiOVVSnxTaySM8ELpGVVvppqqPvUY,2289
-reconcile/utils/aws_api.py,sha256=n2HMUPOnztcDt7c8GvGpT0qrpwArXke0hSCHQ1dSk6w,79439
+reconcile/utils/aws_api.py,sha256=1sQgbDqRBLQuwJ6dfmbl6L_6LsgMrIm6G7Cn7s61Q5Q,80375
 reconcile/utils/aws_helper.py,sha256=8PvDR17ntAGX3bBzlTIxDuENl2rkK-RECsNYKm2_DZw,2955
 reconcile/utils/batches.py,sha256=TtEm64a8lWhFuNbUVpFEmXVdU2Q0sTBrP_I0Cjbgh7g,320
 reconcile/utils/binary.py,sha256=lSIevhilMeoGMePPHD7A-pxe45LVpBT0LksecYbM-EA,2477
@@ -650,7 +650,7 @@ reconcile/utils/sqs_gateway.py,sha256=XNIf3PY4UCPNufP2Ul0UJj3fKlt5larBba-VTT-41F
 reconcile/utils/state.py,sha256=az4tBmZ0EdbFcAGiBVUxs3cr2-BVWsuDQiNTvjjQq8s,16378
 reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,352
 reconcile/utils/template.py,sha256=wTvRU4AnAV_o042tD4Mwls2dwWMuk7MKnde3MaCjaYg,331
-reconcile/utils/terraform_client.py,sha256=H8frsS370y8xfivKLNBD1dwlBLHvfuR6JSN_syBL5Qc,36033
+reconcile/utils/terraform_client.py,sha256=IDlrNvGEc2i6ElZIL_fzaJEad1nRC3DkP9_VXhJXmU0,37329
 reconcile/utils/terrascript_aws_client.py,sha256=4NNr1zYd2NNrR7q8W-YDkZOg5DvX-pStYEBRD12sebM,287496
 reconcile/utils/three_way_diff_strategy.py,sha256=oQcHXd9LVhirJfoaOBoHUYuZVGfyL2voKr6KVI34zZE,4833
 reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
@@ -791,7 +791,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.dev117.dist-info/METADATA,sha256=S3Kx-hAT-fWFr3euw9iw6lKLHFYTSrIrIWtZT3Ib8hk,24566
-qontract_reconcile-0.10.2.dev117.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev117.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev117.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev119.dist-info/METADATA,sha256=SKqDG8b-t6tqKTkpG1py04j64dM91WT5KMO5Ir65rGc,24566
+qontract_reconcile-0.10.2.dev119.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev119.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev119.dist-info/RECORD,,

reconcile/utils/aws_api.py

@@ -2076,6 +2076,32 @@ class AWSApi:
             return versions[0]["ValidUpgradeTarget"]
         return []
 
+    def check_db_engine_version(
+        self,
+        account_name: str,
+        engine: str,
+        engine_version: str,
+        region_name: str | None = None,
+    ) -> bool:
+        """
+        Check the version of the database engine is available or deprecated.
+        :param account_name: the name of the account in app-interface
+        :param engine: the database engine (ex. mysql, postgres)
+        :param engine_version: the database engine version
+        :param region_name: AWS region name for the resource, otherwise fallback to default
+        """
+        optional_kwargs = {}
+
+        if region_name:
+            optional_kwargs["region_name"] = region_name
+
+        rds = self._account_rds_client(account_name, **optional_kwargs)
+        response = rds.describe_db_engine_versions(
+            Engine=engine,
+            EngineVersion=engine_version,
+        )
+        return len(response["DBEngineVersions"]) == 1
+
     def describe_db_parameter_group(
         self,
         account_name: str,

reconcile/utils/terraform_client.py

@@ -775,7 +775,17 @@ class TerraformClient:  # pylint: disable=too-many-public-methods
         before_version = before["engine_version"]
         after = resource_change["after"]
         after_version = after["engine_version"]
+        blue_green_update = after.get("blue_green_update", [])
+        changed_fields = self._resource_diff_changed_fields("update", resource_change)
+        # blue_green_update is not a actully rds field.
+        if "blue_green_update" in changed_fields:
+            changed_fields.remove("blue_green_update")
         if after_version == before_version:
+            if changed_fields and blue_green_update and blue_green_update[0]["enabled"]:
+                raise RdsUpgradeValidationError(
+                    f"Cannot modify RDS instance: {resource_name} for {changed_fields} with blue/green updates. "
+                    f"Blue/green updates are recommended only for major version upgrades."
+                )
             return
 
         region_name = get_region_from_availability_zone(before["availability_zone"])
@@ -806,17 +816,15 @@ class TerraformClient:  # pylint: disable=too-many-public-methods
                     f"{resource_name} to a new major version."
                 )
 
-            blue_green_update = after.get("blue_green_update", [])
             if blue_green_update and blue_green_update[0]["enabled"]:
-                changed_fields = self._resource_diff_changed_fields(
-                    "update", resource_change
-                )
                 replica = before["replicas"] != [] or before["replicate_source_db"]
                 self.validate_blue_green_update_requirements(
                     account_name,
                     resource_name,
                     engine,
+                    target["IsMajorVersionUpgrade"],
                     before_version,
+                    after_version,
                     replica,
                     before["parameter_group_name"],
                     region_name,
@@ -828,12 +836,20 @@ class TerraformClient:  # pylint: disable=too-many-public-methods
         account_name: str,
         resource_name: str,
         engine: str,
-        version: str,
+        is_major_version_upgrade: bool,
+        before_version: str,
+        after_version: str,
         replica: bool,
         parameter_group: str,
         region_name: str,
         changed_fields: set[str],
     ) -> None:
+        if not is_major_version_upgrade:
+            raise RdsUpgradeValidationError(
+                f"Cannot upgrade RDS instance: {resource_name}. "
+                f"Blue/green updates are recommended only for major version upgrades."
+            )
+
         min_supported_versions = {
             "mysql": [pkg_version.parse("5.7"), pkg_version.parse("8.0.15")],
             "postgres": [
@@ -860,10 +876,18 @@ class TerraformClient:  # pylint: disable=too-many-public-methods
                 )
             return False
 
-        if not is_supported(engine, version):
+        if not is_supported(engine=engine, version=before_version):
             raise RdsUpgradeValidationError(
                 f"Cannot upgrade RDS instance: {resource_name}. "
-                f"Engine version {version} is not supported for blue/green updates."
+                f"Engine version {before_version} is not supported for blue/green updates."
+            )
+
+        if self._aws_api and not self._aws_api.check_db_engine_version(
+            account_name, engine, after_version, region_name=region_name
+        ):
+            raise RdsUpgradeValidationError(
+                f"Cannot upgrade RDS instance: {resource_name} with blue/green updates. "
+                f"Target engine version {after_version} is deprecated."
             )
 
         if replica: