From e5872cc0e46fbf3ec851930cb1d9832dc50c4ac7 Mon Sep 17 00:00:00 2001
From: Eugene Prystupa <eugene.prystupa@gmail.com>
Date: Mon, 6 Jul 2020 21:09:56 -0400
Subject: [PATCH] apply small feedback suggestions from a previous PR that is
 already merged (#37551)

---
 homeassistant/components/bond/__init__.py    | 3 ---
 homeassistant/components/bond/config_flow.py | 4 ++--
 homeassistant/components/bond/cover.py       | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/homeassistant/components/bond/__init__.py b/homeassistant/components/bond/__init__.py
index 199841673bf..697023546ac 100644
--- a/homeassistant/components/bond/__init__.py
+++ b/homeassistant/components/bond/__init__.py
@@ -2,7 +2,6 @@
 import asyncio
 
 from bond import Bond
-import voluptuous as vol
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_HOST
@@ -10,8 +9,6 @@ from homeassistant.core import HomeAssistant
 
 from .const import DOMAIN
 
-CONFIG_SCHEMA = vol.Schema({DOMAIN: vol.Schema({})}, extra=vol.ALLOW_EXTRA)
-
 PLATFORMS = ["cover"]
 
 
diff --git a/homeassistant/components/bond/config_flow.py b/homeassistant/components/bond/config_flow.py
index 0ee633b79bb..6adc135c9e7 100644
--- a/homeassistant/components/bond/config_flow.py
+++ b/homeassistant/components/bond/config_flow.py
@@ -51,8 +51,6 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
         if user_input is not None:
             try:
                 info = await validate_input(self.hass, user_input)
-
-                return self.async_create_entry(title=info["title"], data=user_input)
             except CannotConnect:
                 errors["base"] = "cannot_connect"
             except InvalidAuth:
@@ -60,6 +58,8 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
             except Exception:  # pylint: disable=broad-except
                 _LOGGER.exception("Unexpected exception")
                 errors["base"] = "unknown"
+            else:
+                return self.async_create_entry(title=info["title"], data=user_input)
 
         return self.async_show_form(
             step_id="user", data_schema=DATA_SCHEMA, errors=errors
diff --git a/homeassistant/components/bond/cover.py b/homeassistant/components/bond/cover.py
index 149ad8b9225..e3bb30ad5d1 100644
--- a/homeassistant/components/bond/cover.py
+++ b/homeassistant/components/bond/cover.py
@@ -64,7 +64,7 @@ class BondCover(CoverEntity):
     @property
     def device_info(self) -> Optional[Dict[str, Any]]:
         """Get a an HA device representing this cover."""
-        return {ATTR_NAME: self.name, "identifiers": {(DOMAIN, self.unique_id)}}
+        return {ATTR_NAME: self.name, "identifiers": {(DOMAIN, self._device.device_id)}}
 
     @property
     def is_closed(self):