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

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

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

@@ -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=41q05A4C_eS3E8-MR4veeMxtQNsPoGdxmEa3d-OKxq4,2814
-reconcile/dynatrace_token_provider/integration.py,sha256=ffH4BpMNb3AafwengwzurZ-aiztGP1MUlnVU4FnO3IY,21540
+reconcile/dynatrace_token_provider/integration.py,sha256=QY-k5vsbBOm80yW_RB6G2JZD5NY21zCyqHigos7GjRM,20876
 reconcile/dynatrace_token_provider/metrics.py,sha256=xiKkl8fTEBQaXJelGCPNTZhHAWdO1M3pCXNr_Tei63c,1285
 reconcile/dynatrace_token_provider/model.py,sha256=gkpqo5rRRueBXnIMjp4EEHqBUBuU65TRI8zpdb8GJ0A,241
 reconcile/dynatrace_token_provider/ocm.py,sha256=iHMsgbsLs-dlrB9UXmWNDF7E4UDe49JOsLa9rnowKfo,4282
@@ -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
@@ -744,7 +744,7 @@ reconcile/utils/clusterhealth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 reconcile/utils/clusterhealth/providerbase.py,sha256=DXomGYogckBLqWtXn0PXU0hWYxB6K0F7ernldrkHhVY,1140
 reconcile/utils/clusterhealth/telemeter.py,sha256=PllSLsJXvGNatmTF4mxCNPVbDrpr_MPk0m5pWj-LT6g,1534
 reconcile/utils/dynatrace/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/utils/dynatrace/client.py,sha256=siVDdCQeLaWm4W1T-QKnFwlotPmXmZfpyoe3pXowBt8,2760
+reconcile/utils/dynatrace/client.py,sha256=dVaTwIlLhutv_2sxL_ISIQkN5br1Tfm14dhVP_hwePI,2834
 reconcile/utils/glitchtip/__init__.py,sha256=FT6iBhGqoe7KExFdbgL8AYUb64iW_4snF5__Dcl7yt0,258
 reconcile/utils/glitchtip/client.py,sha256=ovh4tx-ajlihjvcq6nyY4chulbuMJYvzDPv9j9CuAKM,7867
 reconcile/utils/glitchtip/models.py,sha256=uHbCK9-RWgxNYUAkEHXRAZRDDZW7jkOFFt9MdlqN4bU,6481
@@ -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.1rc1014.dist-info/METADATA,sha256=_oYiLMwp1_SSIsoW1g1574AcwpLZcBG_NwIFvcUG_XU,2263
-qontract_reconcile-0.10.1rc1014.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc1014.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1014.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1014.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/dynatrace_token_provider/integration.py

@@ -96,7 +96,7 @@ class DynatraceTokenProviderIntegration(
                         for cluster in clusters
                         if cluster.organization_id in self.params.ocm_organization_ids
                     ]
-                existing_dtp_tokens = {}
+                existing_dtp_tokens: dict[str, dict[str, str]] = {}
 
                 for cluster in clusters:
                     try:
@@ -139,7 +139,7 @@ class DynatraceTokenProviderIntegration(
                                 continue
                             if tenant_id not in existing_dtp_tokens:
                                 existing_dtp_tokens[tenant_id] = (
-                                    dt_client.get_token_ids_for_name_prefix(
+                                    dt_client.get_token_ids_map_for_name_prefix(
                                         prefix="dtp-"
                                     )
                                 )
@@ -172,7 +172,7 @@ class DynatraceTokenProviderIntegration(
         cluster: Cluster,
         dt_client: DynatraceClient,
         ocm_client: OCMClient,
-        existing_dtp_tokens: Iterable[str],
+        existing_dtp_tokens: Mapping[str, str],
         tenant_id: str,
         token_spec: DynatraceTokenProviderTokenSpecV1,
     ) -> None:
@@ -281,7 +281,7 @@ class DynatraceTokenProviderIntegration(
         dry_run: bool,
         current_k8s_secrets: Iterable[K8sSecret],
         desired_spec: DynatraceTokenProviderTokenSpecV1,
-        existing_dtp_tokens: Iterable[str],
+        existing_dtp_tokens: Mapping[str, str],
         dt_client: DynatraceClient,
         cluster_uuid: str,
     ) -> tuple[bool, Iterable[K8sSecret]]:
@@ -377,15 +377,12 @@ class DynatraceTokenProviderIntegration(
                 raise e
         return manifest
 
-    def get_secrets_from_syncset(
-        self, syncset: Mapping[str, Any], token_spec: DynatraceTokenProviderTokenSpecV1
+    def get_secrets_from_data(
+        self,
+        secret_data_by_name: Mapping[str, Any],
+        token_spec: DynatraceTokenProviderTokenSpecV1,
     ) -> list[K8sSecret]:
         secrets: list[K8sSecret] = []
-        secret_data_by_name = {
-            resource.get("metadata", {}).get("name"): resource.get("data", {})
-            for resource in syncset.get("resources", [])
-            if resource.get("kind") == "Secret"
-        }
         for secret in token_spec.secrets:
             secret_data = secret_data_by_name.get(secret.name)
             if secret_data:
@@ -414,42 +411,29 @@ class DynatraceTokenProviderIntegration(
                 )
         return secrets
 
+    def get_secrets_from_syncset(
+        self, syncset: Mapping[str, Any], token_spec: DynatraceTokenProviderTokenSpecV1
+    ) -> list[K8sSecret]:
+        secret_data_by_name = {
+            resource.get("metadata", {}).get("name"): resource.get("data", {})
+            for resource in syncset.get("resources", [])
+            if resource.get("kind") == "Secret"
+        }
+        return self.get_secrets_from_data(
+            secret_data_by_name=secret_data_by_name, token_spec=token_spec
+        )
+
     def get_secrets_from_manifest(
         self, manifest: Mapping[str, Any], token_spec: DynatraceTokenProviderTokenSpecV1
     ) -> list[K8sSecret]:
-        secrets: list[K8sSecret] = []
         secret_data_by_name = {
             resource.get("metadata", {}).get("name"): resource.get("data", {})
             for resource in manifest.get("workloads", [])
             if resource.get("kind") == "Secret"
         }
-        for secret in token_spec.secrets:
-            secret_data = secret_data_by_name.get(secret.name)
-            if secret_data:
-                tokens = []
-                for token in secret.tokens:
-                    token_id = self.base64_decode(
-                        secret_data.get(f"{token.key_name_in_secret}Id", "")
-                    )
-                    token_value = self.base64_decode(
-                        secret_data.get(token.key_name_in_secret, "")
-                    )
-                    tokens.append(
-                        DynatraceAPIToken(
-                            id=token_id,
-                            token=token_value,
-                            name=token.name,
-                            secret_key=token.key_name_in_secret,
-                        )
-                    )
-                secrets.append(
-                    K8sSecret(
-                        secret_name=secret.name,
-                        namespace_name=secret.namespace,
-                        tokens=tokens,
-                    )
-                )
-        return secrets
+        return self.get_secrets_from_data(
+            secret_data_by_name=secret_data_by_name, token_spec=token_spec
+        )
 
     def construct_secrets_data(
         self,

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/dynatrace/client.py

@@ -49,14 +49,16 @@ class DynatraceClient:
             ) from e
         return DynatraceAPITokenCreated(token=token.token, id=token.id)
 
-    def get_token_ids_for_name_prefix(self, prefix: str) -> list[str]:
+    def get_token_ids_map_for_name_prefix(self, prefix: str) -> dict[str, str]:
         try:
             dt_tokens = self._api.tokens.list()
         except Exception as e:
             raise DynatraceTokenRetrievalError(
                 f"{self._environment_url=} Failed to retrieve tokens for {prefix=}", e
             ) from e
-        return [token.id for token in dt_tokens if token.name.startswith(prefix)]
+        return {
+            token.id: token.name for token in dt_tokens if token.name.startswith(prefix)
+        }
 
     def get_token_by_id(self, token_id: str) -> DynatraceAPIToken:
         try:
@@ -67,10 +69,11 @@ class DynatraceClient:
             ) from e
         return DynatraceAPIToken(id=token.id, scopes=token.scopes)
 
-    def update_token_scopes(self, token_id: str, scopes: list[str]) -> None:
+    def update_token(self, token_id: str, name: str, scopes: list[str]) -> None:
         try:
             self._api.tokens.put(
                 token_id=token_id,
+                name=name,
                 api_token=ApiTokenUpdate(
                     scopes=scopes,
                 ),

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):