fix: backport

prowler-cloud · Feb 5, 2025 · d2d08f0 · d2d08f0
1 parent 0f85cd6
commit d2d08f0
Showing 1 changed file with 7 additions and 35 deletions.
diff --git a/prowler/providers/aws/services/elasticache/elasticache_service.py b/prowler/providers/aws/services/elasticache/elasticache_service.py
@@ -77,50 +77,22 @@ def __list_tags_for_resource__(self):
                     cluster.tags = regional_client.list_tags_for_resource(
                         ResourceName=cluster.arn
                     )["TagList"]
-<<<<<<< HEAD
                 except ClientError as error:
                     if error.response["Error"]["Code"] == "CacheClusterNotFound":
                         logger.warning(
                             f"{regional_client.region} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
                         )
+                    if (
+                        error.response["Error"]["Code"]
+                        == "InvalidReplicationGroupStateFault"
+                    ):
+                        logger.warning(
+                            f"{regional_client.region} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
+                        )
                     else:
                         logger.error(
                             f"{regional_client.region} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
                         )
-=======
-                except regional_client.exceptions.CacheClusterNotFoundFault as error:
-                    logger.warning(
-                        f"{regional_client.region} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
-                    )
-                except (
-                    regional_client.exceptions.InvalidReplicationGroupStateFault
-                ) as error:
-                    logger.warning(
-                        f"{regional_client.region} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
-                    )
-                except Exception as error:
-                    logger.error(
-                        f"{regional_client.region} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
-                    )
-            for repl_group in self.replication_groups.values():
-                try:
-                    regional_client = self.regional_clients[repl_group.region]
-                    repl_group.tags = regional_client.list_tags_for_resource(
-                        ResourceName=repl_group.arn
-                    )["TagList"]
-                except (
-                    regional_client.exceptions.ReplicationGroupNotFoundFault
-                ) as error:
-                    logger.warning(
-                        f"{regional_client.region} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
-                    )
-                except (
-                    regional_client.exceptions.InvalidReplicationGroupStateFault
-                ) as error:
-                    logger.warning(
-                        f"{regional_client.region} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
-                    )
->>>>>>> 2934752ee (fix(elasticache): InvalidReplicationGroupStateFault error (#6815))
                 except Exception as error:
                     logger.error(
                         f"{regional_client.region} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"