qontract-reconcile 0.10.1rc1015__py3-none-any.whl → 0.10.1rc1016__py3-none-any.whl

{qontract_reconcile-0.10.1rc1015.dist-info → qontract_reconcile-0.10.1rc1016.dist-info}/METADATA

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

@@ -644,7 +644,7 @@ reconcile/unleash_feature_toggles/integration.py,sha256=nx7BhtzCsTfPbOp60vI5MkNw
 reconcile/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/aggregated_list.py,sha256=km0xadW0jO4G_CqZPsXmoBURQ8c90FaTu5x4X1K1cZs,3357
 reconcile/utils/amtool.py,sha256=ngtBuVPETH6oAy5RnKzvreVbjwQCaATS_PYYwBprzjQ,2288
-reconcile/utils/aws_api.py,sha256=C90pODy5UB2YRV2Yd9Z4J5aTnMZk1CZv9YxbCN0I1-4,66822
+reconcile/utils/aws_api.py,sha256=FHE7tVN91ZAVDARN9EYr7kY3kB6UWtvZSlsvHcDyzx8,66830
 reconcile/utils/aws_helper.py,sha256=MDbv5jrNdqqJ5pfBxniGdJXBBO_EYc2_Uf2w9ZzeMNs,2854
 reconcile/utils/batches.py,sha256=TtEm64a8lWhFuNbUVpFEmXVdU2Q0sTBrP_I0Cjbgh7g,320
 reconcile/utils/binary.py,sha256=7MaAFBpzuBUTJ_aA6G6-eult_BPMVyiXbBLD0Y6F-DM,2301
@@ -716,7 +716,7 @@ reconcile/utils/sqs_gateway.py,sha256=XNIf3PY4UCPNufP2Ul0UJj3fKlt5larBba-VTT-41F
 reconcile/utils/state.py,sha256=a_EO5u7__Pqd0_E3MqzUttJ-0xRtuxcNx5oQi5WIahI,16392
 reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,352
 reconcile/utils/template.py,sha256=wTvRU4AnAV_o042tD4Mwls2dwWMuk7MKnde3MaCjaYg,331
-reconcile/utils/terraform_client.py,sha256=QTLRB33dWOlf2AmZPntx3WWBV8d_-cwMZyLKd7eqclk,34176
+reconcile/utils/terraform_client.py,sha256=4eYKaKfG5wYfR--e1jHpmoMq36Q-JX1_WtT916wlMVw,34669
 reconcile/utils/terrascript_aws_client.py,sha256=1JgXcCF_-xbaAg7V9qihL1Xz5okQlSSrT1DeXGducHc,278037
 reconcile/utils/three_way_diff_strategy.py,sha256=oQcHXd9LVhirJfoaOBoHUYuZVGfyL2voKr6KVI34zZE,4833
 reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
@@ -859,8 +859,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.1rc1015.dist-info/METADATA,sha256=SjLjAyfV0eoceoItqeaPqvVGbI2tMBP1Xst6__37_sM,2263
-qontract_reconcile-0.10.1rc1015.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc1015.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1015.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1015.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1016.dist-info/METADATA,sha256=yZiOVjfUvuD98NWXAJmjOZenh3UfAagM6WdkE9BQ1xo,2263
+qontract_reconcile-0.10.1rc1016.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc1016.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1016.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1016.dist-info/RECORD,,

reconcile/utils/aws_api.py

@@ -1646,7 +1646,7 @@ class AWSApi:  # pylint: disable=too-many-public-methods
         parameters = {}
         for page in paginator.paginate(DBParameterGroupName=db_parameter_group_name):
             for param in page.get("Parameters", []):
-                parameters[param["ParameterName"]] = param["ParameterValue"]
+                parameters[param["ParameterName"]] = param.get("ParameterValue", "")
         return parameters
 
     def get_organization_billing_account(self, account_name: str) -> str:

reconcile/utils/terraform_client.py

@@ -772,40 +772,45 @@ class TerraformClient:  # pylint: disable=too-many-public-methods
                 None,
             )
             if target is None:
-                raise ValueError(
+                logging.error(
                     f"Cannot upgrade RDS instance: {resource_name} "
                     f"from {before_version} to {after_version}"
                 )
+                return
             allow_major_version_upgrade = after.get(
                 "allow_major_version_upgrade",
                 False,
             )
             if target["IsMajorVersionUpgrade"] and not allow_major_version_upgrade:
-                raise ValueError(
+                logging.error(
                     "allow_major_version_upgrade is not enabled for upgrading RDS instance: "
                     f"{resource_name} to a new major version."
                 )
+                return
 
-            blue_green_update = after.get("blue_green_update", {}).get("enabled", False)
-            if blue_green_update:
+            blue_green_update = after.get("blue_green_update", [])
+            if blue_green_update and blue_green_update[0]["enabled"]:
+                replica = before["replicas"] != [] or before["replicate_source_db"]
                 self.validate_blue_green_update_requirements(
                     account_name,
+                    resource_name,
                     engine,
-                    after_version,
-                    before["db_parameter_group_name"],
-                    before.get("replica_source"),
+                    before_version,
+                    replica,
+                    before["parameter_group_name"],
                     region_name,
                 )
 
     def validate_blue_green_update_requirements(
         self,
-        account_name,
-        engine,
-        version,
-        parameter_group,
-        replica_source,
-        region_name,
-    ):
+        account_name: str,
+        resource_name: str,
+        engine: str,
+        version: str,
+        replica: bool,
+        parameter_group: str,
+        region_name: str,
+    ) -> None:
         min_supported_versions = {
             "mysql": [pkg_version.parse("5.7"), pkg_version.parse("8.0.15")],
             "postgres": [
@@ -833,23 +838,29 @@ class TerraformClient:  # pylint: disable=too-many-public-methods
             return False
 
         if not is_supported(engine, version):
-            raise ValueError(
+            logging.error(
+                f"Cannot upgrade RDS instance: {resource_name}. "
                 f"Engine version {version} is not supported for blue/green updates."
             )
+            return
 
-        if replica_source:
-            raise ValueError(
+        if replica:
+            logging.error(
+                f"Cannot upgrade RDS instance: {resource_name}. "
                 "Blue/green updates are not supported for instances with read replicas."
             )
+            return
 
-        if engine == "postgres" and parameter_group:
+        if engine == "postgres" and self._aws_api is not None:
             pg_details = self._aws_api.describe_db_parameter_group(
                 account_name, parameter_group, region_name
             )
             if pg_details.get("rds.logical_replication") != "1":
-                raise ValueError(
-                    f"Parameter group {parameter_group} does not have logical replication enabled."
+                logging.error(
+                    f"Cannot upgrade RDS instance: {resource_name}. "
+                    f"Blue/green updates require logical replication to be enabled in the Parameter group {parameter_group}."
                 )
+                return
 
 
 class TerraformPlanFailed(Exception):