From ccf52cfe30e19094c3d34fe47a094227554fc26e Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Fri, 10 Oct 2025 08:15:59 -1000
Subject: [PATCH] deisolate

---
 script/analyze_component_buses.py         | 1 -
 tests/components/http_request/common.yaml | 4 ++++
 tests/components/mqtt/common-update.yaml  | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/script/analyze_component_buses.py b/script/analyze_component_buses.py
index 323b560553..574ea2a484 100755
--- a/script/analyze_component_buses.py
+++ b/script/analyze_component_buses.py
@@ -74,7 +74,6 @@ ISOLATED_COMPONENTS = {
     "esphome": "Defines devices/areas in esphome: section that are referenced in other sections - breaks when merged",
     "ethernet": "Defines ethernet: which conflicts with wifi: used by most components",
     "ethernet_info": "Related to ethernet component which conflicts with wifi",
-    "http_request": "Defines multiple ota.http_request configurations that create ID conflicts when merged",
     "lvgl": "Defines multiple SDL displays on host platform that conflict when merged with other display configs",
     "matrix_keypad": "Needs isolation due to keypad",
     "mcp4725": "no YAML config to specify i2c bus id",
diff --git a/tests/components/http_request/common.yaml b/tests/components/http_request/common.yaml
index 97961007e2..9ff9f9fb67 100644
--- a/tests/components/http_request/common.yaml
+++ b/tests/components/http_request/common.yaml
@@ -51,6 +51,7 @@ script:
 
 ota:
   - platform: http_request
+    id: http_request_ota
     on_begin:
       then:
         - logger.log: "OTA start"
@@ -77,10 +78,12 @@ button:
     on_press:
       then:
         - ota.http_request.flash:
+            id: http_request_ota
             md5_url: http://my.ha.net:8123/local/esphome/firmware.md5
             url: http://my.ha.net:8123/local/esphome/firmware.bin
 
         - ota.http_request.flash:
+            id: http_request_ota
             md5: 0123456789abcdef0123456789abcdef
             url: http://my.ha.net:8123/local/esphome/firmware.bin
 
@@ -90,6 +93,7 @@ update:
   - platform: http_request
     name: OTA Update
     id: ota_update
+    ota_id: http_request_ota
     source: http://my.ha.net:8123/local/esphome/manifest.json
     on_update_available:
       - logger.log: "A new update is available"
diff --git a/tests/components/mqtt/common-update.yaml b/tests/components/mqtt/common-update.yaml
index 25f57cfef2..2e21e9687a 100644
--- a/tests/components/mqtt/common-update.yaml
+++ b/tests/components/mqtt/common-update.yaml
@@ -6,8 +6,10 @@ http_request:
 
 ota:
   - platform: http_request
+    id: mqtt_http_request_ota
 
 update:
   - platform: http_request
     name: "OTA Update"
+    ota_id: mqtt_http_request_ota
     source: https://example.com/ota.json