Revert "Added support for Windows paths in SambaHook (#54459)"

This reverts commit 53ec9e1.

Author: gopidesupavan

providers/samba/docs/connections.rst

@@ -42,6 +42,3 @@ Login
 
 Password
     The password of the user that will be used for authentication against the Samba server.
-
-Share Type
-    The share OS type (``posix`` or ``windows``). Used to determine the formatting of file and folder paths.

providers/samba/src/airflow/providers/samba/hooks/samba.py

@@ -17,10 +17,10 @@
 # under the License.
 from __future__ import annotations
 
+import posixpath
 from functools import wraps
-from pathlib import PurePosixPath, PureWindowsPath
 from shutil import copyfileobj
-from typing import TYPE_CHECKING, Any, Literal
+from typing import TYPE_CHECKING, Any
 
 import smbclient
 
@@ -41,21 +41,14 @@ class SambaHook(BaseHook):
     :param share:
         An optional share name. If this is unset then the "schema" field of
         the connection is used in its place.
-    :param share_type:
-        An optional share type name. If this is unset then it will assume a posix share type.
     """
 
     conn_name_attr = "samba_conn_id"
     default_conn_name = "samba_default"
     conn_type = "samba"
     hook_name = "Samba"
 
-    def __init__(
-        self,
-        samba_conn_id: str = default_conn_name,
-        share: str | None = None,
-        share_type: Literal["posix", "windows"] | None = None,
-    ) -> None:
+    def __init__(self, samba_conn_id: str = default_conn_name, share: str | None = None) -> None:
         super().__init__()
         conn = self.get_connection(samba_conn_id)
 
@@ -65,13 +58,6 @@ def __init__(
         if not conn.password:
             self.log.info("Password not provided")
 
-        self._share_type = share_type or conn.extra_dejson.get("share_type", "posix")
-        if self._share_type not in {"posix", "windows"}:
-            self._share_type = "posix"
-            self.log.warning(
-                "Invalid share_type specified. It must be either 'posix' or 'windows'. Falling back to 'posix'"
-            )
-
         connection_cache: dict[str, smbprotocol.connection.Connection] = {}
 
         self._host = conn.host
@@ -98,18 +84,8 @@ def __exit__(self, exc_type, exc_value, traceback):
             connection.disconnect()
         self._connection_cache.clear()
 
-    @staticmethod
-    def _join_posix_path(host: str, share: str, path: str) -> str:
-        return str(PurePosixPath("//" + host, share, path.lstrip("/")))
-
-    @staticmethod
-    def _join_windows_path(host: str, share: str, path: str) -> str:
-        return "\\{}".format(PureWindowsPath(rf"\\{host}\\{share}", path.lstrip(r"\/")))
-
     def _join_path(self, path):
-        if self._share_type == "windows":
-            return self._join_windows_path(self._host, self._share, path)
-        return self._join_posix_path(self._host, self._share, path)
+        return f"//{posixpath.join(self._host, self._share, path.lstrip('/'))}"
 
     @wraps(smbclient.link)
     def link(self, src, dst, follow_symlinks=True):
@@ -317,20 +293,6 @@ def push_from_local(self, destination_filepath: str, local_filepath: str, buffer
     def get_ui_field_behaviour(cls) -> dict[str, Any]:
         """Return custom field behaviour."""
         return {
-            "hidden_fields": [],
+            "hidden_fields": ["extra"],
             "relabeling": {"schema": "Share"},
         }
-
-    @classmethod
-    def get_connection_form_widgets(cls) -> dict[str, Any]:
-        """Return connection widgets to add to connection form."""
-        from flask_babel import lazy_gettext
-        from wtforms import StringField
-
-        return {
-            "share_type": StringField(
-                label=lazy_gettext("Share Type"),
-                description="The share OS type (`posix` or `windows`). Used to determine the formatting of file and folder paths.",
-                default="posix",
-            )
-        }

providers/samba/tests/unit/samba/hooks/test_samba.py

@@ -148,38 +148,14 @@ def test_method(self, get_conn_mock, name):
             assert dict(kwargs, **connection_settings) == p_kwargs
 
     @pytest.mark.parametrize(
-        "path, path_type, full_path",
+        "path, full_path",
         [
-            # Linux path -> Linux path, no path_type (default)
-            ("/start/path/with/slash", None, "//ip/share/start/path/with/slash"),
-            ("start/path/without/slash", None, "//ip/share/start/path/without/slash"),
-            # Linux path -> Linux path, explicit path_type (posix)
-            ("/start/path/with/slash/posix", "posix", "//ip/share/start/path/with/slash/posix"),
-            ("start/path/without/slash/posix", "posix", "//ip/share/start/path/without/slash/posix"),
-            # Linux path -> Windows path, explicit path_type (windows)
-            ("/start/path/with/slash/windows", "windows", r"\\ip\share\start\path\with\slash\windows"),
-            ("start/path/without/slash/windows", "windows", r"\\ip\share\start\path\without\slash\windows"),
-            # Windows path -> Windows path, explicit path_type (windows)
-            (
-                r"\start\path\with\backslash\windows",
-                "windows",
-                r"\\ip\share\start\path\with\backslash\windows",
-            ),
-            (
-                r"start\path\without\backslash\windows",
-                "windows",
-                r"\\ip\share\start\path\without\backslash\windows",
-            ),
+            ("/start/path/with/slash", "//ip/share/start/path/with/slash"),
+            ("start/path/without/slash", "//ip/share/start/path/without/slash"),
         ],
     )
     @mock.patch(f"{BASEHOOK_PATCH_PATH}.get_connection")
-    def test__join_path(
-        self,
-        get_conn_mock,
-        path,
-        path_type,
-        full_path,
-    ):
+    def test__join_path(self, get_conn_mock, path, full_path):
         CONNECTION = Connection(
             host="ip",
             schema="share",
@@ -188,7 +164,7 @@ def test__join_path(
         )
 
         get_conn_mock.return_value = CONNECTION
-        hook = SambaHook("samba_default", share_type=path_type)
+        hook = SambaHook("samba_default")
         assert hook._join_path(path) == full_path
 
     @mock.patch("airflow.providers.samba.hooks.samba.smbclient.open_file", return_value=mock.Mock())