From 425911e850f6f86a8ef5889c0e3563c2bd528388 Mon Sep 17 00:00:00 2001
From: Robert Svensson <Kane610@users.noreply.github.com>
Date: Sun, 23 Jan 2022 23:14:02 +0100
Subject: [PATCH] Use whole config entry in deCONZ diagnostics (#64795)

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

diff --git a/homeassistant/components/deconz/diagnostics.py b/homeassistant/components/deconz/diagnostics.py
index 7156b8638e4..d8fdfeae2bd 100644
--- a/homeassistant/components/deconz/diagnostics.py
+++ b/homeassistant/components/deconz/diagnostics.py
@@ -5,12 +5,12 @@ from typing import Any
 
 from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_API_KEY
+from homeassistant.const import CONF_API_KEY, CONF_UNIQUE_ID
 from homeassistant.core import HomeAssistant
 
 from .gateway import get_gateway_from_config_entry
 
-REDACT_CONFIG = {CONF_API_KEY}
+REDACT_CONFIG = {CONF_API_KEY, CONF_UNIQUE_ID}
 REDACT_DECONZ_CONFIG = {"bridgeid", "mac", "panid"}
 
 
@@ -21,8 +21,7 @@ async def async_get_config_entry_diagnostics(
     gateway = get_gateway_from_config_entry(hass, config_entry)
     diag: dict[str, Any] = {}
 
-    diag["config"] = async_redact_data(config_entry.data, REDACT_CONFIG)
-    diag["options"] = dict(config_entry.options)
+    diag["config"] = async_redact_data(config_entry.as_dict(), REDACT_CONFIG)
     diag["deconz_config"] = async_redact_data(
         gateway.api.config.raw, REDACT_DECONZ_CONFIG
     )
diff --git a/tests/components/deconz/test_diagnostics.py b/tests/components/deconz/test_diagnostics.py
index 1e3e0f77325..7d351a333cf 100644
--- a/tests/components/deconz/test_diagnostics.py
+++ b/tests/components/deconz/test_diagnostics.py
@@ -21,8 +21,19 @@ async def test_entry_diagnostics(
     await hass.async_block_till_done()
 
     assert await get_diagnostics_for_config_entry(hass, hass_client, config_entry) == {
-        "config": {CONF_API_KEY: REDACTED, CONF_HOST: HOST, CONF_PORT: PORT},
-        "options": {CONF_MASTER_GATEWAY: True},
+        "config": {
+            "data": {CONF_API_KEY: REDACTED, CONF_HOST: HOST, CONF_PORT: PORT},
+            "disabled_by": None,
+            "domain": "deconz",
+            "entry_id": "1",
+            "options": {CONF_MASTER_GATEWAY: True},
+            "pref_disable_new_entities": False,
+            "pref_disable_polling": False,
+            "source": "user",
+            "title": "Mock Title",
+            "unique_id": REDACTED,
+            "version": 1,
+        },
         "deconz_config": {
             "bridgeid": REDACTED,
             "ipaddress": HOST,