From ae04c5d7737dcd9e8878e1f150fb8d6a474f5be5 Mon Sep 17 00:00:00 2001
From: Jan Bouwhuis <jbouwh@users.noreply.github.com>
Date: Wed, 1 Mar 2023 18:42:34 +0100
Subject: [PATCH] Clean up unused and deprecated TLS version setting on MQTT
 client (#88674)

* Cleanup CONF_TLS_VERSION remains

* Fix diagnostics tests
---
 homeassistant/components/mqtt/__init__.py           | 2 --
 homeassistant/components/mqtt/config_integration.py | 5 -----
 homeassistant/components/mqtt/const.py              | 1 -
 tests/components/mqtt/test_diagnostics.py           | 1 -
 tests/components/mqtt/test_discovery.py             | 1 -
 5 files changed, 10 deletions(-)

diff --git a/homeassistant/components/mqtt/__init__.py b/homeassistant/components/mqtt/__init__.py
index a1b194284c7..c73eec12449 100644
--- a/homeassistant/components/mqtt/__init__.py
+++ b/homeassistant/components/mqtt/__init__.py
@@ -74,7 +74,6 @@ from .const import (  # noqa: F401
     CONF_QOS,
     CONF_STATE_TOPIC,
     CONF_TLS_INSECURE,
-    CONF_TLS_VERSION,
     CONF_TOPIC,
     CONF_TRANSPORT,
     CONF_WILL_MESSAGE,
@@ -160,7 +159,6 @@ CONFIG_SCHEMA = vol.Schema(
             cv.deprecated(CONF_PORT),  # Deprecated in HA Core 2022.3
             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_VERSION),  # Deprecated June 2020
             cv.deprecated(CONF_USERNAME),  # Deprecated in HA Core 2022.3
             cv.deprecated(CONF_WILL_MESSAGE),  # Deprecated in HA Core 2022.3
             CONFIG_SCHEMA_BASE,
diff --git a/homeassistant/components/mqtt/config_integration.py b/homeassistant/components/mqtt/config_integration.py
index bbd6861435b..47f8a7cf492 100644
--- a/homeassistant/components/mqtt/config_integration.py
+++ b/homeassistant/components/mqtt/config_integration.py
@@ -45,7 +45,6 @@ from .const import (
     CONF_DISCOVERY_PREFIX,
     CONF_KEEPALIVE,
     CONF_TLS_INSECURE,
-    CONF_TLS_VERSION,
     CONF_TRANSPORT,
     CONF_WILL_MESSAGE,
     CONF_WS_HEADERS,
@@ -72,7 +71,6 @@ DEFAULT_VALUES = {
     CONF_DISCOVERY_PREFIX: DEFAULT_PREFIX,
     CONF_PORT: DEFAULT_PORT,
     CONF_PROTOCOL: DEFAULT_PROTOCOL,
-    CONF_TLS_VERSION: DEFAULT_TLS_PROTOCOL,
     CONF_TRANSPORT: DEFAULT_TRANSPORT,
     CONF_WILL_MESSAGE: DEFAULT_WILL,
     CONF_KEEPALIVE: DEFAULT_KEEPALIVE,
@@ -182,7 +180,6 @@ CONFIG_SCHEMA_ENTRY = vol.Schema(
             CONF_CLIENT_CERT, "client_key_auth", msg=CLIENT_KEY_AUTH_MSG
         ): str,
         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_WILL_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
         ): cv.isfile,
         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_WILL_MESSAGE): valid_birth_will,
         vol.Optional(CONF_BIRTH_MESSAGE): valid_birth_will,
@@ -236,7 +232,6 @@ DEPRECATED_CONFIG_KEYS = [
     CONF_PORT,
     CONF_PROTOCOL,
     CONF_TLS_INSECURE,
-    CONF_TLS_VERSION,
     CONF_USERNAME,
     CONF_WILL_MESSAGE,
 ]
diff --git a/homeassistant/components/mqtt/const.py b/homeassistant/components/mqtt/const.py
index f7e2cbe5b1b..bb6b8ed497d 100644
--- a/homeassistant/components/mqtt/const.py
+++ b/homeassistant/components/mqtt/const.py
@@ -33,7 +33,6 @@ CONF_CERTIFICATE = "certificate"
 CONF_CLIENT_KEY = "client_key"
 CONF_CLIENT_CERT = "client_cert"
 CONF_TLS_INSECURE = "tls_insecure"
-CONF_TLS_VERSION = "tls_version"
 
 DATA_MQTT = "mqtt"
 
diff --git a/tests/components/mqtt/test_diagnostics.py b/tests/components/mqtt/test_diagnostics.py
index b0ff769e727..780be729259 100644
--- a/tests/components/mqtt/test_diagnostics.py
+++ b/tests/components/mqtt/test_diagnostics.py
@@ -24,7 +24,6 @@ default_config = {
     "keepalive": 60,
     "port": 1883,
     "protocol": "3.1.1",
-    "tls_version": "auto",
     "transport": "tcp",
     "ws_headers": {},
     "ws_path": "/",
diff --git a/tests/components/mqtt/test_discovery.py b/tests/components/mqtt/test_discovery.py
index ba472cce041..5cd615e0eb6 100644
--- a/tests/components/mqtt/test_discovery.py
+++ b/tests/components/mqtt/test_discovery.py
@@ -1266,7 +1266,6 @@ ABBREVIATIONS_WHITE_LIST = [
     "CONF_EMBEDDED",
     "CONF_KEEPALIVE",
     "CONF_TLS_INSECURE",
-    "CONF_TLS_VERSION",
     "CONF_TRANSPORT",
     "CONF_WILL_MESSAGE",
     "CONF_WS_PATH",