From 21bbc227246f8b5bb41cb149d0fc2b192a85c7f4 Mon Sep 17 00:00:00 2001
From: jason810496 <zhu424.dev@gmail.com>
Date: Wed, 4 Dec 2024 11:53:13 +0800
Subject: [PATCH 1/2] Remove Provider Deprecations in Redis

---
 .../src/airflow/providers/redis/CHANGELOG.rst | 11 +++++
 .../airflow/providers/redis/hooks/redis.py    | 14 +-----
 providers/tests/redis/hooks/test_redis.py     | 44 -------------------
 3 files changed, 12 insertions(+), 57 deletions(-)

diff --git a/providers/src/airflow/providers/redis/CHANGELOG.rst b/providers/src/airflow/providers/redis/CHANGELOG.rst
index 2f53fb18b0c32..715553e757f25 100644
--- a/providers/src/airflow/providers/redis/CHANGELOG.rst
+++ b/providers/src/airflow/providers/redis/CHANGELOG.rst
@@ -27,6 +27,17 @@
 Changelog
 ---------
 
+main
+.....
+
+.. warning::
+   All deprecated classes, parameters and features have been removed from the Redis provider package.
+   The following breaking changes were introduced:
+
+   * Hooks
+
+      * Removed ``ssl_cert_file`` parameter from ``RedisHook``. Use ``ssl_certfile`` instead
+
 3.8.0
 .....
 
diff --git a/providers/src/airflow/providers/redis/hooks/redis.py b/providers/src/airflow/providers/redis/hooks/redis.py
index 10890f36b0eb1..2f956a5cb137e 100644
--- a/providers/src/airflow/providers/redis/hooks/redis.py
+++ b/providers/src/airflow/providers/redis/hooks/redis.py
@@ -19,12 +19,10 @@
 
 from __future__ import annotations
 
-import warnings
 from typing import Any
 
 from redis import Redis
 
-from airflow.exceptions import AirflowProviderDeprecationWarning
 from airflow.hooks.base import BaseHook
 
 DEFAULT_SSL_CERT_REQS = "required"
@@ -37,7 +35,7 @@ class RedisHook(BaseHook):
 
     You can set your db in the extra field of your connection as ``{"db": 3}``.
     Also you can set ssl parameters as:
-    ``{"ssl": true, "ssl_cert_reqs": "require", "ssl_cert_file": "/path/to/cert.pem", etc}``.
+    ``{"ssl": true, "ssl_cert_reqs": "require", "ssl_certfile": "/path/to/cert.pem", etc}``.
     """
 
     conn_name_attr = "redis_conn_id"
@@ -81,16 +79,6 @@ def get_conn(self):
         ]
         ssl_args = {name: val for name, val in conn.extra_dejson.items() if name in ssl_arg_names}
 
-        # This logic is for backward compatibility only
-        if "ssl_cert_file" in conn.extra_dejson and "ssl_certfile" not in conn.extra_dejson:
-            warnings.warn(
-                "Extra parameter `ssl_cert_file` deprecated and will be removed "
-                "in a future release. Please use `ssl_certfile` instead.",
-                AirflowProviderDeprecationWarning,
-                stacklevel=2,
-            )
-            ssl_args["ssl_certfile"] = conn.extra_dejson.get("ssl_cert_file")
-
         if not self.redis:
             self.log.debug(
                 'Initializing redis object for conn_id "%s" on %s:%s:%s',
diff --git a/providers/tests/redis/hooks/test_redis.py b/providers/tests/redis/hooks/test_redis.py
index 1216dc6b64131..479cee7752fcb 100644
--- a/providers/tests/redis/hooks/test_redis.py
+++ b/providers/tests/redis/hooks/test_redis.py
@@ -21,7 +21,6 @@
 
 import pytest
 
-from airflow.exceptions import AirflowProviderDeprecationWarning
 from airflow.models import Connection
 from airflow.providers.redis.hooks.redis import RedisHook
 
@@ -29,11 +28,6 @@
 
 
 class TestRedisHook:
-    deprecation_message = (
-        "Extra parameter `ssl_cert_file` deprecated and will be removed "
-        "in a future release. Please use `ssl_certfile` instead."
-    )
-
     def test_get_conn(self):
         hook = RedisHook(redis_conn_id="redis_default")
         assert hook.redis is None
@@ -82,44 +76,6 @@ def test_get_conn_with_extra_config(self, mock_get_connection, mock_redis):
             ssl_check_hostname=connection.extra_dejson["ssl_check_hostname"],
         )
 
-    @mock.patch("airflow.providers.redis.hooks.redis.Redis")
-    @mock.patch(
-        "airflow.providers.redis.hooks.redis.RedisHook.get_connection",
-        return_value=Connection(
-            password="password",
-            host="remote_host",
-            port=1234,
-            extra="""{
-                        "db": 2,
-                        "ssl": true,
-                        "ssl_cert_reqs": "required",
-                        "ssl_ca_certs": "/path/to/custom/ca-cert",
-                        "ssl_keyfile": "/path/to/key-file",
-                        "ssl_cert_file": "/path/to/cert-file",
-                        "ssl_check_hostname": true
-                    }""",
-        ),
-    )
-    def test_get_conn_with_deprecated_extra_config(self, mock_get_connection, mock_redis):
-        connection = mock_get_connection.return_value
-        hook = RedisHook()
-
-        with pytest.warns(AirflowProviderDeprecationWarning, match=self.deprecation_message):
-            hook.get_conn()
-        mock_redis.assert_called_once_with(
-            host=connection.host,
-            password=connection.password,
-            username=None,
-            port=connection.port,
-            db=connection.extra_dejson["db"],
-            ssl=connection.extra_dejson["ssl"],
-            ssl_cert_reqs=connection.extra_dejson["ssl_cert_reqs"],
-            ssl_ca_certs=connection.extra_dejson["ssl_ca_certs"],
-            ssl_keyfile=connection.extra_dejson["ssl_keyfile"],
-            ssl_certfile=connection.extra_dejson["ssl_cert_file"],
-            ssl_check_hostname=connection.extra_dejson["ssl_check_hostname"],
-        )
-
     def test_get_conn_password_stays_none(self):
         hook = RedisHook(redis_conn_id="redis_default")
         hook.get_conn()

From d5ff66eb89308d506704b4235e3583ebfcebed3a Mon Sep 17 00:00:00 2001
From: jason810496 <zhu424.dev@gmail.com>
Date: Thu, 5 Dec 2024 21:00:00 +0800
Subject: [PATCH 2/2] Fix mock_get_connection in test_redis

---
 providers/tests/redis/hooks/test_redis.py | 30 ++++++++++++-----------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/providers/tests/redis/hooks/test_redis.py b/providers/tests/redis/hooks/test_redis.py
index 479cee7752fcb..b64ffb909d241 100644
--- a/providers/tests/redis/hooks/test_redis.py
+++ b/providers/tests/redis/hooks/test_redis.py
@@ -41,24 +41,26 @@ def test_get_conn(self):
     @mock.patch("airflow.providers.redis.hooks.redis.Redis")
     @mock.patch(
         "airflow.providers.redis.hooks.redis.RedisHook.get_connection",
-        return_value=Connection(
+    )
+    def test_get_conn_with_extra_config(self, mock_get_connection, mock_redis):
+        connection = Connection(
             login="user",
             password="password",
             host="remote_host",
             port=1234,
-            extra="""{
-                        "db": 2,
-                        "ssl": true,
-                        "ssl_cert_reqs": "required",
-                        "ssl_ca_certs": "/path/to/custom/ca-cert",
-                        "ssl_keyfile": "/path/to/key-file",
-                        "ssl_certfile": "/path/to/cert-file",
-                        "ssl_check_hostname": true
-                    }""",
-        ),
-    )
-    def test_get_conn_with_extra_config(self, mock_get_connection, mock_redis):
-        connection = mock_get_connection.return_value
+        )
+        connection.set_extra(
+            """{
+                "db": 2,
+                "ssl": true,
+                "ssl_cert_reqs": "required",
+                "ssl_ca_certs": "/path/to/custom/ca-cert",
+                "ssl_keyfile": "/path/to/key-file",
+                "ssl_certfile": "/path/to/cert-file",
+                "ssl_check_hostname": true
+            }"""
+        )
+        mock_get_connection.return_value = connection
         hook = RedisHook()
 
         hook.get_conn()
