evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up unused and deprecated TLS version setting on MQTT client (#88674)

Browse source 
* Cleanup CONF_TLS_VERSION remains

* Fix diagnostics tests
This commit is contained in:
Jan Bouwhuis 2023-03-01 18:42:34 +01:00 • committed by GitHub
parent bdbec491eb
commit ae04c5d773
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 0 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
homeassistant/components/mqtt/__init__.py
View file

@ -74,7 +74,6 @@ from .const import ( # noqa: F401
CONF_QOS, CONF_QOS,
CONF_STATE_TOPIC, CONF_STATE_TOPIC,
CONF_TLS_INSECURE, CONF_TLS_INSECURE,
CONF_TLS_VERSION,
CONF_TOPIC, CONF_TOPIC,
CONF_TRANSPORT, CONF_TRANSPORT,
CONF_WILL_MESSAGE, CONF_WILL_MESSAGE,
@ -160,7 +159,6 @@ CONFIG_SCHEMA = vol.Schema(
cv.deprecated(CONF_PORT), # Deprecated in HA Core 2022.3 cv.deprecated(CONF_PORT), # Deprecated in HA Core 2022.3
cv.deprecated(CONF_PROTOCOL), # Deprecated in HA Core 2022.11 cv.deprecated(CONF_PROTOCOL), # Deprecated in HA Core 2022.11
cv.deprecated(CONF_TLS_INSECURE), # Deprecated in HA Core 2022.11 cv.deprecated(CONF_TLS_INSECURE), # Deprecated in HA Core 2022.11
cv.deprecated(CONF_TLS_VERSION), # Deprecated June 2020
cv.deprecated(CONF_USERNAME), # Deprecated in HA Core 2022.3 cv.deprecated(CONF_USERNAME), # Deprecated in HA Core 2022.3
cv.deprecated(CONF_WILL_MESSAGE), # Deprecated in HA Core 2022.3 cv.deprecated(CONF_WILL_MESSAGE), # Deprecated in HA Core 2022.3
CONFIG_SCHEMA_BASE, CONFIG_SCHEMA_BASE,

5
homeassistant/components/mqtt/config_integration.py
View file

@ -45,7 +45,6 @@ from .const import (
CONF_DISCOVERY_PREFIX, CONF_DISCOVERY_PREFIX,
CONF_KEEPALIVE, CONF_KEEPALIVE,
CONF_TLS_INSECURE, CONF_TLS_INSECURE,
CONF_TLS_VERSION,
CONF_TRANSPORT, CONF_TRANSPORT,
CONF_WILL_MESSAGE, CONF_WILL_MESSAGE,
CONF_WS_HEADERS, CONF_WS_HEADERS,
@ -72,7 +71,6 @@ DEFAULT_VALUES = {
CONF_DISCOVERY_PREFIX: DEFAULT_PREFIX, CONF_DISCOVERY_PREFIX: DEFAULT_PREFIX,
CONF_PORT: DEFAULT_PORT, CONF_PORT: DEFAULT_PORT,
CONF_PROTOCOL: DEFAULT_PROTOCOL, CONF_PROTOCOL: DEFAULT_PROTOCOL,
CONF_TLS_VERSION: DEFAULT_TLS_PROTOCOL,
CONF_TRANSPORT: DEFAULT_TRANSPORT, CONF_TRANSPORT: DEFAULT_TRANSPORT,
CONF_WILL_MESSAGE: DEFAULT_WILL, CONF_WILL_MESSAGE: DEFAULT_WILL,
CONF_KEEPALIVE: DEFAULT_KEEPALIVE, CONF_KEEPALIVE: DEFAULT_KEEPALIVE,
@ -182,7 +180,6 @@ CONFIG_SCHEMA_ENTRY = vol.Schema(
CONF_CLIENT_CERT, "client_key_auth", msg=CLIENT_KEY_AUTH_MSG CONF_CLIENT_CERT, "client_key_auth", msg=CLIENT_KEY_AUTH_MSG
): str, ): str,
vol.Optional(CONF_TLS_INSECURE): cv.boolean, vol.Optional(CONF_TLS_INSECURE): cv.boolean,
vol.Optional(CONF_TLS_VERSION): vol.Any("auto", "1.0", "1.1", "1.2"),
vol.Optional(CONF_PROTOCOL): vol.All(cv.string, vol.In(SUPPORTED_PROTOCOLS)), vol.Optional(CONF_PROTOCOL): vol.All(cv.string, vol.In(SUPPORTED_PROTOCOLS)),
vol.Optional(CONF_WILL_MESSAGE): valid_birth_will, vol.Optional(CONF_WILL_MESSAGE): valid_birth_will,
vol.Optional(CONF_BIRTH_MESSAGE): valid_birth_will, vol.Optional(CONF_BIRTH_MESSAGE): valid_birth_will,
@ -214,7 +211,6 @@ CONFIG_SCHEMA_BASE = PLATFORM_CONFIG_SCHEMA_BASE.extend(
CONF_CLIENT_CERT, "client_key_auth", msg=CLIENT_KEY_AUTH_MSG CONF_CLIENT_CERT, "client_key_auth", msg=CLIENT_KEY_AUTH_MSG
): cv.isfile, ): cv.isfile,
vol.Optional(CONF_TLS_INSECURE): cv.boolean, vol.Optional(CONF_TLS_INSECURE): cv.boolean,
vol.Optional(CONF_TLS_VERSION): vol.Any("auto", "1.0", "1.1", "1.2"),
vol.Optional(CONF_PROTOCOL): vol.All(cv.string, vol.In(SUPPORTED_PROTOCOLS)), vol.Optional(CONF_PROTOCOL): vol.All(cv.string, vol.In(SUPPORTED_PROTOCOLS)),
vol.Optional(CONF_WILL_MESSAGE): valid_birth_will, vol.Optional(CONF_WILL_MESSAGE): valid_birth_will,
vol.Optional(CONF_BIRTH_MESSAGE): valid_birth_will, vol.Optional(CONF_BIRTH_MESSAGE): valid_birth_will,
@ -236,7 +232,6 @@ DEPRECATED_CONFIG_KEYS = [
CONF_PORT, CONF_PORT,
CONF_PROTOCOL, CONF_PROTOCOL,
CONF_TLS_INSECURE, CONF_TLS_INSECURE,
CONF_TLS_VERSION,
CONF_USERNAME, CONF_USERNAME,
CONF_WILL_MESSAGE, CONF_WILL_MESSAGE,
] ]

1
homeassistant/components/mqtt/const.py
View file

@ -33,7 +33,6 @@ CONF_CERTIFICATE = "certificate"
CONF_CLIENT_KEY = "client_key" CONF_CLIENT_KEY = "client_key"
CONF_CLIENT_CERT = "client_cert" CONF_CLIENT_CERT = "client_cert"
CONF_TLS_INSECURE = "tls_insecure" CONF_TLS_INSECURE = "tls_insecure"
CONF_TLS_VERSION = "tls_version"
DATA_MQTT = "mqtt" DATA_MQTT = "mqtt"

1
tests/components/mqtt/test_diagnostics.py
View file

@ -24,7 +24,6 @@ default_config = {
"keepalive": 60, "keepalive": 60,
"port": 1883, "port": 1883,
"protocol": "3.1.1", "protocol": "3.1.1",
"tls_version": "auto",
"transport": "tcp", "transport": "tcp",
"ws_headers": {}, "ws_headers": {},
"ws_path": "/", "ws_path": "/",

1
tests/components/mqtt/test_discovery.py
View file

@ -1266,7 +1266,6 @@ ABBREVIATIONS_WHITE_LIST = [
"CONF_EMBEDDED", "CONF_EMBEDDED",
"CONF_KEEPALIVE", "CONF_KEEPALIVE",
"CONF_TLS_INSECURE", "CONF_TLS_INSECURE",
"CONF_TLS_VERSION",
"CONF_TRANSPORT", "CONF_TRANSPORT",
"CONF_WILL_MESSAGE", "CONF_WILL_MESSAGE",
"CONF_WS_PATH", "CONF_WS_PATH",