From 55f9db6992c2e08c4d1c85a66b91f66ea9202005 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Mon, 11 Feb 2019 21:57:17 +0100
Subject: [PATCH] Bump aioesphomeapi to 1.5.0 (#20986)

* Bump aioesphomeapi to 1.5.0

* Update requirements_all.txt

* Fix editor line length setting
---
 homeassistant/components/esphome/__init__.py    | 2 +-
 homeassistant/components/esphome/config_flow.py | 9 ++++-----
 requirements_all.txt                            | 2 +-
 tests/components/esphome/test_config_flow.py    | 4 +++-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/homeassistant/components/esphome/__init__.py b/homeassistant/components/esphome/__init__.py
index 1ff2c10c828..8d113b6ab9d 100644
--- a/homeassistant/components/esphome/__init__.py
+++ b/homeassistant/components/esphome/__init__.py
@@ -31,7 +31,7 @@ if TYPE_CHECKING:
         ServiceCall
 
 DOMAIN = 'esphome'
-REQUIREMENTS = ['aioesphomeapi==1.4.2']
+REQUIREMENTS = ['aioesphomeapi==1.5.0']
 
 
 DISPATCHER_UPDATE_ENTITY = 'esphome_{entry_id}_update_{component_key}_{key}'
diff --git a/homeassistant/components/esphome/config_flow.py b/homeassistant/components/esphome/config_flow.py
index 1f71d8d66b5..e509455c12e 100644
--- a/homeassistant/components/esphome/config_flow.py
+++ b/homeassistant/components/esphome/config_flow.py
@@ -55,11 +55,10 @@ class EsphomeFlowHandler(config_entries.ConfigFlow):
 
     async def async_step_discovery(self, user_input: ConfigType):
         """Handle discovery."""
-        # mDNS hostname has additional '.' at end
-        hostname = user_input['hostname'][:-1]
-        hosts = (hostname, user_input['host'])
+        address = user_input['properties'].get(
+            'address', user_input['hostname'][:-1])
         for entry in self._async_current_entries():
-            if entry.data['host'] in hosts:
+            if entry.data['host'] == address:
                 return self.async_abort(
                     reason='already_configured'
                 )
@@ -67,7 +66,7 @@ class EsphomeFlowHandler(config_entries.ConfigFlow):
         # Prefer .local addresses (mDNS is available after all, otherwise
         # we wouldn't have received the discovery message)
         return await self.async_step_user(user_input={
-            'host': hostname,
+            'host': address,
             'port': user_input['port'],
         })
 
diff --git a/requirements_all.txt b/requirements_all.txt
index 182268212be..cae373390ba 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -102,7 +102,7 @@ aioautomatic==0.6.5
 aiodns==1.1.1
 
 # homeassistant.components.esphome
-aioesphomeapi==1.4.2
+aioesphomeapi==1.5.0
 
 # homeassistant.components.freebox
 aiofreepybox==0.0.6
diff --git a/tests/components/esphome/test_config_flow.py b/tests/components/esphome/test_config_flow.py
index 1291aa53123..8c870c6ad73 100644
--- a/tests/components/esphome/test_config_flow.py
+++ b/tests/components/esphome/test_config_flow.py
@@ -242,7 +242,9 @@ async def test_discovery_already_configured_ip(hass, mock_client):
         'host': '192.168.43.183',
         'port': 6053,
         'hostname': 'test8266.local.',
-        'properties': {}
+        'properties': {
+            "address": "192.168.43.183"
+        }
     }
     result = await flow.async_step_discovery(user_input=service_info)
     assert result['type'] == 'abort'