Use PyHive pure-sasl import

.changes/unreleased/Dependencies-20230628-121341.yaml

@@ -0,0 +1,6 @@
+kind: Dependencies
+body: Use PyHive pure-sasl import for >=3.11
+time: 2023-06-28T12:13:41.141588-07:00
+custom:
+  Author: colin-rogers-dbt
+  PR: "818"

.github/workflows/main.yml

@@ -79,7 +79,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
 
     env:
       TOXENV: "unit"
@@ -177,7 +177,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
 
     steps:
       - name: Set up Python ${{ matrix.python-version }}

dbt/adapters/spark/connections.py

@@ -33,8 +33,8 @@
     from thrift.transport.TSSLSocket import TSSLSocket
     import thrift
     import ssl
-    import sasl
     import thrift_sasl
+    from puresasl.client import SASLClient
 except ImportError:
     pass  # done deliberately: setting modules to None explicitly violates MyPy contracts by degrading type semantics
 
@@ -603,17 +603,15 @@ def build_ssl_transport(
                 # to be nonempty.
                 password = "x"
 
-        def sasl_factory() -> sasl.Client:
-            sasl_client = sasl.Client()
-            sasl_client.setAttr("host", host)
+        def sasl_factory() -> SASLClient:
             if sasl_auth == "GSSAPI":
-                sasl_client.setAttr("service", kerberos_service_name)
+                sasl_client = SASLClient(host, kerberos_service_name, mechanism=sasl_auth)
             elif sasl_auth == "PLAIN":
-                sasl_client.setAttr("username", username)
-                sasl_client.setAttr("password", password)
+                sasl_client = SASLClient(
+                    host, mechanism=sasl_auth, username=username, password=password
+                )
             else:
                 raise AssertionError
-            sasl_client.init()
             return sasl_client
 
         transport = thrift_sasl.TSaslClientTransport(sasl_factory, sasl_auth, socket)

requirements.txt

@@ -1,5 +1,5 @@
-PyHive[hive]>=0.6.0,<0.7.0
-requests[python]>=2.28.1
+pyhive[hive_pure_sasl]~=0.7.0
+requests>=2.28.1
 
 pyodbc~=4.0.39
 sqlparams>=3.0.0

setup.py

@@ -9,6 +9,12 @@
     print("Please upgrade to Python 3.8 or higher.")
     sys.exit(1)
 
+# # sasl does not support python 3.11 and higher
+# if sys.version_info < (3, 11):
+#     PYHIVE_SASL_EXTRA = "PyHive[sasl]>=0.6.0,<0.7.0"
+# else:
+#     print("Using pure_sasl for python 3.11 and higher`")
+#     PYHIVE_SASL_EXTRA = "PyHive[hive_pure_sasl]~=0.7.0"
 
 # require version of setuptools that supports find_namespace_packages
 from setuptools import setup
@@ -54,9 +60,9 @@ def _get_dbt_core_version():
 dbt_core_version = _get_dbt_core_version()
 description = """The Apache Spark adapter plugin for dbt"""
 
-odbc_extras = ["pyodbc~=4.0.30"]
+odbc_extras = ["pyodbc~=4.0.39"]
 pyhive_extras = [
-    "PyHive[hive]>=0.6.0,<0.7.0",
+    "PyHive[hive_pure_sasl]~=0.7.0",
     "thrift>=0.11.0,<0.17.0",
 ]
 session_extras = ["pyspark>=3.0.0,<4.0.0"]
@@ -76,6 +82,7 @@ def _get_dbt_core_version():
     install_requires=[
         "dbt-core~={}".format(dbt_core_version),
         "sqlparams>=3.0.0",
+        "pyhive[hive_pure_sasl]~=0.7.0"
     ],
     extras_require={
         "ODBC": odbc_extras,
@@ -93,6 +100,7 @@ def _get_dbt_core_version():
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
     ],
     python_requires=">=3.8",
 )

tox.ini

@@ -1,11 +1,13 @@
 [tox]
 skipsdist = True
 envlist = unit, flake8, integration-spark-thrift
+pip_pre = true
 
 [testenv:{unit,py38,py39,py310,py}]
 allowlist_externals =
     /bin/bash
 commands = /bin/bash -c '{envpython} -m pytest -v {posargs} tests/unit'
+pip_pre = true
 passenv =
     DBT_*
     PYTEST_ADDOPTS
@@ -17,6 +19,7 @@ deps =
 allowlist_externals =
     /bin/bash
 basepython = python3.8
+pip_pre = true
 commands = /bin/bash -c '{envpython} -m pytest -v --profile databricks_http_cluster {posargs} -n4 tests/functional/adapter/*'
 passenv =
     DBT_*
@@ -30,6 +33,7 @@ deps =
 allowlist_externals =
     /bin/bash
 basepython = python3.8
+pip_pre = true
 commands = /bin/bash -c '{envpython} -m pytest -v --profile databricks_cluster {posargs} -n4 tests/functional/adapter/*'
 passenv =
     DBT_*
@@ -44,6 +48,7 @@ deps =
 allowlist_externals =
     /bin/bash
 basepython = python3.8
+pip_pre = true
 commands = /bin/bash -c '{envpython} -m pytest -v --profile databricks_sql_endpoint {posargs} -n4 tests/functional/adapter/*'
 passenv =
     DBT_*
@@ -59,6 +64,7 @@ deps =
 allowlist_externals =
     /bin/bash
 basepython = python3.8
+pip_pre = true
 commands = /bin/bash -c '{envpython} -m pytest -v --profile apache_spark {posargs} -n4 tests/functional/adapter/*'
 passenv =
     DBT_*
@@ -72,6 +78,7 @@ deps =
 allowlist_externals =
     /bin/bash
 basepython = python3.10
+pip_pre = true
 commands = /bin/bash -c '{envpython} -m pytest -v --profile spark_session {posargs} -n4 tests/functional/adapter/*'
 passenv =
     DBT_*