From aecb342fdaef3a5959ef6b771d79da4f53c7e903 Mon Sep 17 00:00:00 2001
From: Tobias Sauerwein <cgtobi@users.noreply.github.com>
Date: Fri, 21 Jan 2022 10:26:18 +0100
Subject: [PATCH] Update Netatmo diagnostics (#64610)

---
 homeassistant/components/netatmo/diagnostics.py | 16 ++++++++++++++--
 tests/components/netatmo/test_diagnostics.py    |  7 ++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/homeassistant/components/netatmo/diagnostics.py b/homeassistant/components/netatmo/diagnostics.py
index 5bf9c340295..6c82c7f1db7 100644
--- a/homeassistant/components/netatmo/diagnostics.py
+++ b/homeassistant/components/netatmo/diagnostics.py
@@ -6,7 +6,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 
 from .const import DATA_HANDLER, DOMAIN
-from .data_handler import NetatmoDataHandler
+from .data_handler import CLIMATE_TOPOLOGY_CLASS_NAME, NetatmoDataHandler
 
 TO_REDACT = {
     "access_token",
@@ -14,10 +14,17 @@ TO_REDACT = {
     "restricted_access_token",
     "restricted_refresh_token",
     "webhook_id",
+    "cloudhook_url",
     "lat_ne",
     "lat_sw",
     "lon_ne",
     "lon_sw",
+    "coordinates",
+    "name",
+    "timetable",
+    "zones",
+    "pseudo",
+    "url",
 }
 
 
@@ -37,5 +44,10 @@ async def async_get_config_entry_diagnostics(
             },
             TO_REDACT,
         ),
-        "data": async_redact_data(data_handler.data, TO_REDACT),
+        "data": {
+            CLIMATE_TOPOLOGY_CLASS_NAME: async_redact_data(
+                getattr(data_handler.data[CLIMATE_TOPOLOGY_CLASS_NAME], "raw_data"),
+                TO_REDACT,
+            )
+        },
     }
diff --git a/tests/components/netatmo/test_diagnostics.py b/tests/components/netatmo/test_diagnostics.py
index fc9d6d410e7..3c4a2090f1b 100644
--- a/tests/components/netatmo/test_diagnostics.py
+++ b/tests/components/netatmo/test_diagnostics.py
@@ -88,8 +88,5 @@ async def test_entry_diagnostics(hass, hass_client, config_entry):
         "webhook_registered": False,
     }
 
-    assert result["data"]["AsyncClimate-111111111111111111111401"] is None
-    assert (
-        result["data"]["AsyncClimate-91763b24c43d3e344f424e8b"]["repr"]
-        == "AsyncClimate(home_id=91763b24c43d3e344f424e8b)"
-    )
+    for home in result["data"]["AsyncClimateTopology"]["homes"]:
+        assert home["coordinates"] == REDACTED