From e3bfbebb8fd3368ac3c351af33407cf77956910d Mon Sep 17 00:00:00 2001
From: Clyde Stubbs <2366188+clydebarrow@users.noreply.github.com>
Date: Thu, 15 Aug 2024 13:35:03 +1000
Subject: [PATCH] [api] Bump noise-c library version (#7288)

---
 .github/workflows/ci.yml                    |  4 ++--
 esphome/components/api/__init__.py          |  2 +-
 esphome/components/host/__init__.py         | 10 +++-------
 tests/components/api/common.yaml            |  4 ----
 tests/components/api/test.esp32-ard.yaml    |  4 ++++
 tests/components/api/test.esp32-c3-ard.yaml |  4 ++++
 tests/components/api/test.esp32-c3-idf.yaml |  4 ++++
 tests/components/api/test.esp32-idf.yaml    |  4 ++++
 tests/components/api/test.esp8266-ard.yaml  |  4 ++++
 tests/components/api/test.host.yaml         |  3 +++
 tests/components/api/test.rp2040-ard.yaml   |  4 ++++
 11 files changed, 33 insertions(+), 14 deletions(-)
 create mode 100644 tests/components/api/test.host.yaml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 126a541b3d..2437dd5b8d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -397,7 +397,7 @@ jobs:
         file: ${{ fromJson(needs.list-components.outputs.components) }}
     steps:
       - name: Install dependencies
-        run: sudo apt-get install libsodium-dev libsdl2-dev
+        run: sudo apt-get install libsdl2-dev
 
       - name: Check out code from GitHub
         uses: actions/checkout@v4.1.7
@@ -451,7 +451,7 @@ jobs:
         run: echo ${{ matrix.components }}
 
       - name: Install dependencies
-        run: sudo apt-get install libsodium-dev libsdl2-dev
+        run: sudo apt-get install libsdl2-dev
 
       - name: Check out code from GitHub
         uses: actions/checkout@v4.1.7
diff --git a/esphome/components/api/__init__.py b/esphome/components/api/__init__.py
index 38b50d4b9d..27de5c873b 100644
--- a/esphome/components/api/__init__.py
+++ b/esphome/components/api/__init__.py
@@ -155,7 +155,7 @@ async def to_code(config):
         decoded = base64.b64decode(encryption_config[CONF_KEY])
         cg.add(var.set_noise_psk(list(decoded)))
         cg.add_define("USE_API_NOISE")
-        cg.add_library("esphome/noise-c", "0.1.4")
+        cg.add_library("esphome/noise-c", "0.1.6")
     else:
         cg.add_define("USE_API_PLAINTEXT")
 
diff --git a/esphome/components/host/__init__.py b/esphome/components/host/__init__.py
index 39e418c9ea..e83bf2dba8 100644
--- a/esphome/components/host/__init__.py
+++ b/esphome/components/host/__init__.py
@@ -1,15 +1,14 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
 from esphome.const import (
+    CONF_MAC_ADDRESS,
     KEY_CORE,
     KEY_FRAMEWORK_VERSION,
     KEY_TARGET_FRAMEWORK,
     KEY_TARGET_PLATFORM,
     PLATFORM_HOST,
-    CONF_MAC_ADDRESS,
 )
 from esphome.core import CORE
-from esphome.helpers import IS_MACOS
-import esphome.config_validation as cv
-import esphome.codegen as cg
 
 from .const import KEY_HOST
 
@@ -42,8 +41,5 @@ async def to_code(config):
     cg.add_build_flag("-DUSE_HOST")
     cg.add_define("USE_ESPHOME_HOST_MAC_ADDRESS", config[CONF_MAC_ADDRESS].parts)
     cg.add_build_flag("-std=c++17")
-    cg.add_build_flag("-lsodium")
-    if IS_MACOS:
-        cg.add_build_flag("-L/opt/homebrew/lib")
     cg.add_define("ESPHOME_BOARD", "host")
     cg.add_platformio_option("platform", "platformio/native")
diff --git a/tests/components/api/common.yaml b/tests/components/api/common.yaml
index 6c2a333598..7ac11e4da6 100644
--- a/tests/components/api/common.yaml
+++ b/tests/components/api/common.yaml
@@ -11,10 +11,6 @@ esphome:
             message: Button was pressed
       - homeassistant.tag_scanned: pulse
 
-wifi:
-  ssid: MySSID
-  password: password1
-
 api:
   port: 8000
   password: pwd
diff --git a/tests/components/api/test.esp32-ard.yaml b/tests/components/api/test.esp32-ard.yaml
index dade44d145..46c01d926f 100644
--- a/tests/components/api/test.esp32-ard.yaml
+++ b/tests/components/api/test.esp32-ard.yaml
@@ -1 +1,5 @@
 <<: !include common.yaml
+
+wifi:
+  ssid: MySSID
+  password: password1
diff --git a/tests/components/api/test.esp32-c3-ard.yaml b/tests/components/api/test.esp32-c3-ard.yaml
index dade44d145..46c01d926f 100644
--- a/tests/components/api/test.esp32-c3-ard.yaml
+++ b/tests/components/api/test.esp32-c3-ard.yaml
@@ -1 +1,5 @@
 <<: !include common.yaml
+
+wifi:
+  ssid: MySSID
+  password: password1
diff --git a/tests/components/api/test.esp32-c3-idf.yaml b/tests/components/api/test.esp32-c3-idf.yaml
index dade44d145..46c01d926f 100644
--- a/tests/components/api/test.esp32-c3-idf.yaml
+++ b/tests/components/api/test.esp32-c3-idf.yaml
@@ -1 +1,5 @@
 <<: !include common.yaml
+
+wifi:
+  ssid: MySSID
+  password: password1
diff --git a/tests/components/api/test.esp32-idf.yaml b/tests/components/api/test.esp32-idf.yaml
index dade44d145..46c01d926f 100644
--- a/tests/components/api/test.esp32-idf.yaml
+++ b/tests/components/api/test.esp32-idf.yaml
@@ -1 +1,5 @@
 <<: !include common.yaml
+
+wifi:
+  ssid: MySSID
+  password: password1
diff --git a/tests/components/api/test.esp8266-ard.yaml b/tests/components/api/test.esp8266-ard.yaml
index dade44d145..46c01d926f 100644
--- a/tests/components/api/test.esp8266-ard.yaml
+++ b/tests/components/api/test.esp8266-ard.yaml
@@ -1 +1,5 @@
 <<: !include common.yaml
+
+wifi:
+  ssid: MySSID
+  password: password1
diff --git a/tests/components/api/test.host.yaml b/tests/components/api/test.host.yaml
new file mode 100644
index 0000000000..1ecafeab77
--- /dev/null
+++ b/tests/components/api/test.host.yaml
@@ -0,0 +1,3 @@
+<<: !include common.yaml
+
+network:
diff --git a/tests/components/api/test.rp2040-ard.yaml b/tests/components/api/test.rp2040-ard.yaml
index dade44d145..46c01d926f 100644
--- a/tests/components/api/test.rp2040-ard.yaml
+++ b/tests/components/api/test.rp2040-ard.yaml
@@ -1 +1,5 @@
 <<: !include common.yaml
+
+wifi:
+  ssid: MySSID
+  password: password1