Reimplement Cloudflare using coordinator #156817

davidrapan · 2025-11-18T16:15:52Z

Proposed change

Reimplement using coordinator to better align w/ the current HA architecture and avoid async_track_time_interval.

+ Fixes missing after setup update thanks to async_config_entry_first_refresh.

Type of change

Dependency upgrade
Bugfix (non-breaking change which fixes an issue)
New integration (thank you!)
New feature (which adds functionality to an existing integration)
Deprecation (breaking change to happen in the future)
Breaking change (fix/feature causing existing functionality to break)
Code quality improvements to existing code or addition of tests

Additional information

This PR fixes or closes issue: fixes #
This PR is related to issue:
Link to documentation pull request:
Link to developer documentation pull request:
Link to frontend pull request:

Checklist

I understand the code I am submitting and can explain how it works.
The code change is tested and works locally.
Local tests pass. Your PR cannot be merged unless tests pass
There is no commented out code in this PR.
I have followed the development checklist
I have followed the perfect PR recommendations
The code has been formatted using Ruff (ruff format homeassistant tests)
Tests have been added to verify that the new code works.
Any generated code has been carefully reviewed for correctness and compliance with project standards.

If user exposed functionality or configuration variables are added/changed:

Documentation added/updated for www.home-assistant.io

If the code communicates with devices, web services, or third-party tools:

The manifest file has all fields filled out correctly.
Updated and included derived files by running: python3 -m script.hassfest.
New or updated dependencies have been added to requirements_all.txt.
Updated by running python3 -m script.gen_requirements_all.
For the updated dependencies - a link to the changelog, or at minimum a diff between library versions is added to the PR description.

To help with the load of incoming pull requests:

I have reviewed two other open pull requests in this repository.

Signed-off-by: David Rapan <[email protected]>

home-assistant · 2025-11-18T16:16:02Z

Hey there @ludeeus, @ctalkington, mind taking a look at this pull request as it has been labeled with an integration (cloudflare) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of cloudflare can trigger bot actions by commenting:

@home-assistant close Closes the pull request.
@home-assistant rename Awesome new title Renames the pull request.
@home-assistant reopen Reopen the pull request.
@home-assistant unassign cloudflare Removes the current integration label and assignees on the pull request, add the integration domain after the command.
@home-assistant add-label needs-more-information Add a label (needs-more-information, problem in dependency, problem in custom component) to the pull request.
@home-assistant remove-label needs-more-information Remove a label (needs-more-information, problem in dependency, problem in custom component) on the pull request.

epenet · 2025-11-18T16:18:56Z

tests/components/cloudflare/test_init.py

+_LOCATION_PATCH_TARGET = (
+    "homeassistant.components.cloudflare.coordinator.async_detect_location_info"
+)
+_LOCATION_PATCH_VALUE = LocationInfo(
+    "0.0.0.0",
+    "US",
+    "USD",
+    "CA",
+    "California",
+    "San Diego",
+    "92122",
+    "America/Los_Angeles",
+    32.8594,
+    -117.2073,
+    True,
+)


I think it would be better to make this a fixture (with patch... yield) in conftest.py, in conjunction with @pytest.mark.usefixtures(xyz).

joostlek · 2025-11-18T16:25:29Z

Impeccable timing 👌🏻

Signed-off-by: David Rapan <[email protected]>

epenet · 2025-11-18T16:50:48Z

tests/components/cloudflare/conftest.py

+
+
+@pytest.fixture
+def location_info() -> Generator:


Suggested change

def location_info() -> Generator:

def location_info() -> Generator[None]:

Yeah, I was just thinking about it.. 😆

Signed-off-by: David Rapan <[email protected]>

mik-laj · 2025-11-18T17:00:02Z

homeassistant/components/cloudflare/coordinator.py

+                f"Error updating zone {self.config_entry.data[CONF_ZONE]}"
+            ) from e
+
+    async def init(self):


I don't think we need this method. It doesn't add much value and makes the code logic harder to follow. One of the common things that's checked is whether the async_setup_entry method is executing the async_config_entry_first_refresh method , and now that's not done explicitly, but through this additional method. This should be moved to async_setup_entry.

https://developers.home-assistant.io/docs/core/integration-quality-scale/rules/test-before-setup

there's also _async_setup in the coordinator for one time setup tasks automatically called during async_config_entry_first_refresh

Well, I do use _async_setup 😉 I'm just wrapping async_config_entry_first_refresh together w/ return self so I can "one-line it" in async_setup_entry.

It's coming from my template which I use when creating custom components, etc. (and changes in this PR are semi-based on it too) But sure, I can remove it. :)

joostlek · 2025-11-18T17:25:25Z

👀 -> Cloudflare had a major outage today

davidrapan · 2025-11-18T21:10:01Z

👀 -> Cloudflare had a major outage today

Today is a major outage day, I see..

mik-laj · 2025-11-18T23:18:25Z

I'm not sure if this PR works as indended. The coordinator doesn't refresh automatically if we don't have any listeners connected, and the Cloudflare integration doesn't provide any entities, so we don't have listeners as listeners are registered by BaseCoordinatorEntity

Signed-off-by: David Rapan <[email protected]>

davidrapan · 2025-11-19T01:09:04Z

Oh yeah, you're right, we were missing a key part for the entityless coordinator. :) I'm not sure if there's a better approach than the one I'm using though..

rlippmann · 2025-11-19T05:17:33Z

Oh yeah, you're right, we were missing a key part for the entityless coordinator. :) I'm not sure if there's a better approach than the one I'm using though..

Just use listeners and don't bother with the coordinator?

Signed-off-by: David Rapan <[email protected]>

Reimplement Cloudflare using coordinator

fa84cfe

Signed-off-by: David Rapan <[email protected]>

davidrapan requested review from ctalkington and ludeeus as code owners November 18, 2025 16:15

home-assistant bot added cla-signed has-tests integration: cloudflare new-feature labels Nov 18, 2025

home-assistant bot assigned ludeeus and ctalkington Nov 18, 2025

home-assistant bot added the Quality Scale: No score label Nov 18, 2025

epenet reviewed Nov 18, 2025

View reviewed changes

davidrapan added 3 commits November 18, 2025 17:43

Use location_info fixture

0764563

Signed-off-by: David Rapan <[email protected]>

Remove Mock import

ef94763

Signed-off-by: David Rapan <[email protected]>

Fix ruffik

3f7e0f8

Signed-off-by: David Rapan <[email protected]>

davidrapan requested a review from epenet November 18, 2025 16:51

epenet reviewed Nov 18, 2025

View reviewed changes

Add None

4ded7ae

Signed-off-by: David Rapan <[email protected]>

davidrapan requested a review from epenet November 18, 2025 16:53

mik-laj reviewed Nov 18, 2025

View reviewed changes

Add missing dummy listener!

85d2751

Signed-off-by: David Rapan <[email protected]>

davidrapan added 2 commits November 19, 2025 11:49

Fix error map during setup

25e240c

Signed-off-by: David Rapan <[email protected]>

Align to UpdateFailed error

07cc995

Signed-off-by: David Rapan <[email protected]>

davidrapan force-pushed the dev-cloudflare branch from 0cf6424 to 07cc995 Compare November 19, 2025 11:04

	def location_info() -> Generator:
	def location_info() -> Generator[None]:

Uh oh!

Reimplement Cloudflare using coordinator #156817

Are you sure you want to change the base?

Reimplement Cloudflare using coordinator #156817

Conversation

davidrapan commented Nov 18, 2025

Proposed change

Type of change

Additional information

Checklist

Uh oh!

home-assistant bot commented Nov 18, 2025

Uh oh!

epenet Nov 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

joostlek commented Nov 18, 2025

Uh oh!

epenet Nov 18, 2025

Choose a reason for hiding this comment

Uh oh!

davidrapan Nov 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mik-laj Nov 18, 2025

Choose a reason for hiding this comment

Uh oh!

zweckj Nov 18, 2025

Choose a reason for hiding this comment

Uh oh!

davidrapan Nov 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

joostlek commented Nov 18, 2025

Uh oh!

davidrapan commented Nov 18, 2025

Uh oh!

mik-laj commented Nov 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

davidrapan commented Nov 19, 2025

Uh oh!

rlippmann commented Nov 19, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

epenet Nov 18, 2025 •

edited

Loading

davidrapan Nov 18, 2025 •

edited

Loading

davidrapan Nov 18, 2025 •

edited

Loading

mik-laj commented Nov 18, 2025 •

edited

Loading