Skip to content

Switchbot_cloud: fixed cloud hook error#175336

Merged
joostlek merged 1 commit into
home-assistant:devfrom
XiaoLing-git:debug_webhook_error_0702
Jul 2, 2026
Merged

Switchbot_cloud: fixed cloud hook error#175336
joostlek merged 1 commit into
home-assistant:devfrom
XiaoLing-git:debug_webhook_error_0702

Conversation

@XiaoLing-git

Copy link
Copy Markdown
Contributor

Breaking change

Proposed change

This issue currently appears to affect only users who have set up HA Cloud webhooks.

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

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:

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 diff between library versions and ideally a link to the changelog/release notes is added to the PR description.

To help with the load of incoming pull requests:

Copilot AI review requested due to automatic review settings July 2, 2026 06:25
@home-assistant

home-assistant Bot commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

Hey there @SeraphicRav, @laurence-presland, @Gigatrappeur, mind taking a look at this pull request as it has been labeled with an integration (switchbot_cloud) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of switchbot_cloud can trigger bot actions by commenting:

  • @home-assistant close Closes the pull request.
  • @home-assistant mark-draft Mark the pull request as draft.
  • @home-assistant ready-for-review Remove the draft status from the pull request.
  • @home-assistant rename Awesome new title Renames the pull request.
  • @home-assistant reopen Reopen the pull request.
  • @home-assistant unassign switchbot_cloud Removes the current integration label and assignees on the pull request, add the integration domain after the command.
  • @home-assistant update-branch Update the pull request branch with the base branch.
  • @home-assistant add-label needs-more-information Add a label (needs-more-information, problem in dependency, problem in custom component, problem in config, problem in device, feature-request) to the pull request.
  • @home-assistant remove-label needs-more-information Remove a label (needs-more-information, problem in dependency, problem in custom component, problem in config, problem in device, feature-request) on the pull request.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Fixes SwitchBot Cloud webhook setup for Home Assistant Cloud (Nabu Casa) users by using the Cloud helper that reuses an existing cloudhook when available, avoiding failures when a hook already exists.

Changes:

  • Replace “delete then create” cloudhook flow with cloud.async_get_or_create_cloudhook(...) in the SwitchBot Cloud integration.
  • Update SwitchBot Cloud integration tests to patch async_get_or_create_cloudhook instead of async_create_cloudhook.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Description
homeassistant/components/switchbot_cloud/__init__.py Uses async_get_or_create_cloudhook to obtain a cloudhook URL and persist it on the config entry.
tests/components/switchbot_cloud/test_init.py Adjusts mocks/patch targets to match the new cloudhook helper used by the integration.
Comments suppressed due to low confidence (1)

homeassistant/components/switchbot_cloud/init.py:531

  • Update the debug log to avoid claiming the cloudhook was newly created when async_get_or_create_cloudhook may return an existing hook.
            cloudhook_url = await cloud.async_get_or_create_cloudhook(hass, webhook_id)
            hass.config_entries.async_update_entry(
                entry, data={**entry.data, CONF_CLOUDHOOK_URL: cloudhook_url}
            )
            _LOGGER.debug("Created SwitchBot Cloud cloudhook: %s", cloudhook_url)
            return cloudhook_url

@cgtobi cgtobi left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@joostlek joostlek added this to the 2026.7.1 milestone Jul 2, 2026
@joostlek joostlek merged commit 54ad066 into home-assistant:dev Jul 2, 2026
33 checks passed
@github-actions github-actions Bot locked and limited conversation to collaborators Jul 3, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants