mirror of
https://github.com/home-assistant/supervisor.git
synced 2026-05-19 22:28:52 +01:00
Mike Degatano
eb3c388618
* Migrate persisted 'addon' field to 'app' in discovery and services config
Rename the 'addon' key to 'app' in persisted configuration files for
discovery messages (discovery.json), service modules (services.json),
and supervisor config (supervisor.json), as part of the broader
addon->app terminology migration.
Changes:
- Add ATTR_ADDON = "addon" to const.py for V1 API compat/migration
- Add ATTR_ADDONS_CUSTOM_LIST = "addons_custom_list" to const.py for migration
- Change ATTR_APPS_CUSTOM_LIST value from "addons_custom_list" to "apps_custom_list"
- Add _migrate_supervisor_config() schema pre-processor in validate.py to
transparently load old supervisor.json files using the old key
- Add ATTR_ADDON to services/const.py; change ATTR_APP value to "app"
- Add _migrate_addon_to_app() pre-processors to MQTT, MySQL, and discovery
schemas to load old config files that used the "addon" key
- Rename Message.addon -> Message.app in Discovery and update all references
- Keep hassio_push/discovery payload using "addon" key for HA compatibility
- GET /services/{service} and GET /discovery: V1 returns "addon" key,
V2 returns "app" key, via dedicated _v1 handler methods following the
backups/store pattern, registered with AppVersion guards in
_register_services() and _register_discovery()
- Broaden FileConfiguration schema type annotation to accept vol.All
validators in addition to vol.Schema
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* Add schema migration tests for addon->app config key rename
Test that backwards-compatible migration of old 'addon'/'addons_custom_list'
keys to 'app'/'apps_custom_list' works correctly in all affected schemas,
and that the new keys are accepted without modification.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* Add an __init__ to discovery tests
* Add app_api_client_with_prefix fixture and update V1/V2 tests
Move the app-level V1/V2 fixture to tests/api/conftest.py as
app_api_client_with_prefix for use across any endpoint that requires
app-level credentials (services_role, app.discovery, etc.).
- Add app_api_client_with_prefix fixture to conftest.py
- Update test_set_service_already_provided and test_del_service_not_provided
to use app_api_client_with_prefix (covers both v1 and v2)
- Add test_get_service_v1_v2_keys asserting addon/app key per version
- Update test_api_discovery_forbidden, test_api_send_del_discovery,
test_api_invalid_discovery to use app_api_client_with_prefix
- Split test_discovery_not_found into test_discovery_not_found_get
(uses api_client_with_prefix, GET requires homeassistant) and
test_discovery_not_found_delete (uses app_api_client_with_prefix)
- Add test_get_discovery_v1_v2_keys asserting addon/app key per version
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---------
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
45 lines
1.4 KiB
Python
45 lines
1.4 KiB
Python
"""Test services data."""
|
|
|
|
from supervisor.services.modules.mqtt import SCHEMA_CONFIG_MQTT
|
|
from supervisor.services.modules.mysql import SCHEMA_CONFIG_MYSQL
|
|
|
|
|
|
def test_data_initial(coresys):
|
|
"""Test initial data for services."""
|
|
assert coresys.services.data.mqtt == {}
|
|
assert coresys.services.data.mysql == {}
|
|
|
|
|
|
def test_schema_config_mqtt_migration():
|
|
"""Test that old 'addon' key is migrated to 'app' in MQTT config."""
|
|
result = SCHEMA_CONFIG_MQTT(
|
|
{"host": "mqtt.local", "port": 1883, "addon": "core_mosquitto"}
|
|
)
|
|
assert result["app"] == "core_mosquitto"
|
|
assert "addon" not in result
|
|
|
|
|
|
def test_schema_config_mqtt_app_unchanged():
|
|
"""Test that new 'app' key in MQTT config passes through unchanged."""
|
|
result = SCHEMA_CONFIG_MQTT(
|
|
{"host": "mqtt.local", "port": 1883, "app": "core_mosquitto"}
|
|
)
|
|
assert result["app"] == "core_mosquitto"
|
|
|
|
|
|
def test_schema_config_mysql_migration():
|
|
"""Test that old 'addon' key is migrated to 'app' in MySQL config."""
|
|
result = SCHEMA_CONFIG_MYSQL(
|
|
{"host": "db.local", "port": 3306, "addon": "core_mariadb"}
|
|
)
|
|
assert result["app"] == "core_mariadb"
|
|
assert "addon" not in result
|
|
|
|
|
|
def test_schema_config_mysql_app_unchanged():
|
|
"""Test that new 'app' key in MySQL config passes through unchanged."""
|
|
result = SCHEMA_CONFIG_MYSQL(
|
|
{"host": "db.local", "port": 3306, "app": "core_mariadb"}
|
|
)
|
|
assert result["app"] == "core_mariadb"
|