From 0710cf3e6ba1481f3058287fbbddb2da64784e2e Mon Sep 17 00:00:00 2001
From: Allen Porter <allen.porter@gmail.com>
Date: Sun, 21 Dec 2025 09:50:51 -0800
Subject: [PATCH] Redact additional unnecessary diagnostic fields (#159546)

---
 .../components/roborock/diagnostics.py          | 17 ++++++++++++++++-
 .../roborock/snapshots/test_diagnostics.ambr    | 12 ++++++------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/homeassistant/components/roborock/diagnostics.py b/homeassistant/components/roborock/diagnostics.py
index 02231909908..642dd254c21 100644
--- a/homeassistant/components/roborock/diagnostics.py
+++ b/homeassistant/components/roborock/diagnostics.py
@@ -13,7 +13,22 @@ from .coordinator import RoborockConfigEntry
 
 _LOGGER = logging.getLogger(__name__)
 
-TO_REDACT_CONFIG = ["token", "sn", "rruid", CONF_UNIQUE_ID, "username", "uid"]
+TO_REDACT_CONFIG = [
+    "token",
+    "sn",
+    "rruid",
+    CONF_UNIQUE_ID,
+    "username",
+    "uid",
+    "h",
+    "k",
+    "s",
+    "u",
+    "avatarurl",
+    "nickname",
+    "tuyaUuid",
+    "extra",
+]
 
 
 async def async_get_config_entry_diagnostics(
diff --git a/tests/components/roborock/snapshots/test_diagnostics.ambr b/tests/components/roborock/snapshots/test_diagnostics.ambr
index 6cc9db53a6f..5d79ea4458a 100644
--- a/tests/components/roborock/snapshots/test_diagnostics.ambr
+++ b/tests/components/roborock/snapshots/test_diagnostics.ambr
@@ -4,22 +4,22 @@
     'config_entry': dict({
       'base_url': 'https://usiot.roborock.com',
       'user_data': dict({
-        'avatarurl': 'https://files.roborock.com/iottest/default_avatar.png',
+        'avatarurl': '**REDACTED**',
         'country': 'US',
         'countrycode': '1',
-        'nickname': 'user_nickname',
+        'nickname': '**REDACTED**',
         'region': 'us',
         'rriot': dict({
-          'h': 'abc123',
-          'k': 'abc123',
+          'h': '**REDACTED**',
+          'k': '**REDACTED**',
           'r': dict({
             'a': 'https://api-us.roborock.com',
             'l': 'https://wood-us.roborock.com',
             'm': 'ssl://mqtt-us-2.roborock.com:8883',
             'r': 'US',
           }),
-          's': 'abc123',
-          'u': 'abc123',
+          's': '**REDACTED**',
+          'u': '**REDACTED**',
         }),
         'rruid': '**REDACTED**',
         'token': '**REDACTED**',