Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Secure against resetting a non active modbus #115364

Merged
merged 3 commits into from
Apr 10, 2024
Merged

Secure against resetting a non active modbus #115364

merged 3 commits into from
Apr 10, 2024

Conversation

janiversen
Copy link
Member

Breaking change

Proposed change

Calling async_reset_platform() when modbus is not loaded, caused a keyError, solved.

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

  • 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.

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 link to the changelog, or at minimum a diff between library versions is added to the PR description.
  • Untested files have been added to .coveragerc.

To help with the load of incoming pull requests:

@janiversen janiversen added this to the 2024.4.3 milestone Apr 10, 2024
joostlek
joostlek reviewed Apr 10, 2024
View reviewed changes
homeassistant/components/modbus/__init__.py Outdated
@@ -463,6 +463,9 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:

async def async_reset_platform(hass: HomeAssistant, integration_name: str) -> None:
"""Release modbus resources."""
if DOMAIN not in hass.data:
_LOGGER.info("Modbus cannot reload, because it was never loaded")
Copy link
Member

Choose a reason for hiding this comment

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

Isn't this worth an error?

Copy link
Member Author

Choose a reason for hiding this comment

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

ups

Copy link
Member Author

Choose a reason for hiding this comment

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

Copy/paste error (mine), corrected, thanks for catching.

@janiversen janiversen merged commit 220801b into home-assistant:dev Apr 10, 2024
32 of 34 checks passed
@janiversen janiversen deleted the solve115355 branch April 10, 2024 20:09
@github-actions github-actions bot locked and limited conversation to collaborators Apr 11, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@joostlek joostlek joostlek approved these changes

Assignees
No one assigned
Labels
bugfix by-code-owner cherry-picked cla-signed integration: modbus Quality Scale: platinum small-pr PRs with less than 30 lines.
Projects
None yet
Milestone
2024.4.3
3 participants
@janiversen @joostlek @frenck