Revert "Create a method to generate OAuth tokens (#644)"

This reverts commit db1f4ae.

.codegen/__init__.py.tmpl

@@ -1,6 +1,6 @@
 import databricks.sdk.core as client
 import databricks.sdk.dbutils as dbutils
-from databricks.sdk.credentials_provider import CredentialsStrategy
+from databricks.sdk.credentials_provider import CredentialsProvider
 
 from databricks.sdk.mixins.files import DbfsExt
 from databricks.sdk.mixins.compute import ClustersExt
@@ -46,12 +46,10 @@ class WorkspaceClient:
                  debug_headers: bool = None,
                  product="unknown",
                  product_version="0.0.0",
-                 credentials_strategy: CredentialsStrategy = None,
-                 credentials_provider: CredentialsStrategy = None,
+                 credentials_provider: CredentialsProvider = None,
                  config: client.Config = None):
         if not config:
           config = client.Config({{range $args}}{{.}}={{.}}, {{end}}
-            credentials_strategy=credentials_strategy,
             credentials_provider=credentials_provider,
             debug_truncate_bytes=debug_truncate_bytes,
             debug_headers=debug_headers,
@@ -103,12 +101,10 @@ class AccountClient:
                  debug_headers: bool = None,
                  product="unknown",
                  product_version="0.0.0",
-                 credentials_strategy: CredentialsStrategy = None,
-                 credentials_provider: CredentialsStrategy = None,
+                 credentials_provider: CredentialsProvider = None,
                  config: client.Config = None):
         if not config:
           config = client.Config({{range $args}}{{.}}={{.}}, {{end}}
-            credentials_strategy=credentials_strategy,
             credentials_provider=credentials_provider,
             debug_truncate_bytes=debug_truncate_bytes,
             debug_headers=debug_headers,

databricks/sdk/config.py

@@ -11,10 +11,10 @@
 import requests
 
 from .clock import Clock, RealClock
-from .credentials_provider import CredentialsStrategy, DefaultCredentials
+from .credentials_provider import CredentialsProvider, DefaultCredentials
 from .environments import (ALL_ENVS, AzureEnvironment, Cloud,
                            DatabricksEnvironment, get_environment_for_hostname)
-from .oauth import OidcEndpoints, Token
+from .oauth import OidcEndpoints
 from .version import __version__
 
 logger = logging.getLogger('databricks.sdk')
@@ -81,25 +81,15 @@ class Config:
 
     def __init__(self,
                  *,
-                 # Deprecated. Use credentials_strategy instead.
-                 credentials_provider: CredentialsStrategy = None,
-                 credentials_strategy: CredentialsStrategy = None,
+                 credentials_provider: CredentialsProvider = None,
                  product="unknown",
                  product_version="0.0.0",
                  clock: Clock = None,
                  **kwargs):
         self._header_factory = None
         self._inner = {}
         self._user_agent_other_info = []
-        if credentials_strategy and credentials_provider:
-            raise ValueError(
-                "When providing `credentials_strategy` field, `credential_provider` cannot be specified.")
-        if credentials_provider:
-            logger.warning(
-                "parameter 'credentials_provider' is deprecated. Use 'credentials_strategy' instead.")
-        self._credentials_strategy = next(
-            s for s in [credentials_strategy, credentials_provider,
-                        DefaultCredentials()] if s is not None)
+        self._credentials_provider = credentials_provider if credentials_provider else DefaultCredentials()
         if 'databricks_environment' in kwargs:
             self.databricks_environment = kwargs['databricks_environment']
             del kwargs['databricks_environment']
@@ -117,9 +107,6 @@ def __init__(self,
             message = self.wrap_debug_info(str(e))
             raise ValueError(message) from e
 
-    def oauth_token(self) -> Token:
-        return self._credentials_strategy.oauth_token(self)
-
     def wrap_debug_info(self, message: str) -> str:
         debug_string = self.debug_string()
         if debug_string:
@@ -449,12 +436,12 @@ def _validate(self):
 
     def init_auth(self):
         try:
-            self._header_factory = self._credentials_strategy(self)
-            self.auth_type = self._credentials_strategy.auth_type()
+            self._header_factory = self._credentials_provider(self)
+            self.auth_type = self._credentials_provider.auth_type()
             if not self._header_factory:
                 raise ValueError('not configured')
         except ValueError as e:
-            raise ValueError(f'{self._credentials_strategy.auth_type()} auth: {e}') from e
+            raise ValueError(f'{self._credentials_provider.auth_type()} auth: {e}') from e
 
     def __repr__(self):
         return f'<{self.debug_string()}>'

databricks/sdk/core.py

@@ -4,7 +4,6 @@
 from json import JSONDecodeError
 from types import TracebackType
 from typing import Any, BinaryIO, Iterator, Type
-from urllib.parse import urlencode
 
 from requests.adapters import HTTPAdapter
 
@@ -14,17 +13,12 @@
 from .credentials_provider import *
 from .errors import DatabricksError, error_mapper
 from .errors.private_link import _is_private_link_redirect
-from .oauth import retrieve_token
 from .retries import retried
 
 __all__ = ['Config', 'DatabricksError']
 
 logger = logging.getLogger('databricks.sdk')
 
-URL_ENCODED_CONTENT_TYPE = "application/x-www-form-urlencoded"
-JWT_BEARER_GRANT_TYPE = "urn:ietf:params:oauth:grant-type:jwt-bearer"
-OIDC_TOKEN_PATH = "/oidc/v1/token"
-
 
 class ApiClient:
     _cfg: Config
@@ -115,22 +109,6 @@ def flatten_dict(d: Dict[str, Any]) -> Dict[str, Any]:
         flattened = dict(flatten_dict(with_fixed_bools))
         return flattened
 
-    def get_oauth_token(self, auth_details: str) -> Token:
-        if not self._cfg.auth_type:
-            self._cfg.authenticate()
-        original_token = self._cfg.oauth_token()
-        headers = {"Content-Type": URL_ENCODED_CONTENT_TYPE}
-        params = urlencode({
-            "grant_type": JWT_BEARER_GRANT_TYPE,
-            "authorization_details": auth_details,
-            "assertion": original_token.access_token
-        })
-        return retrieve_token(client_id=self._cfg.client_id,
-                              client_secret=self._cfg.client_secret,
-                              token_url=self._cfg.host + OIDC_TOKEN_PATH,
-                              params=params,
-                              headers=headers)
-
     def do(self,
            method: str,
            path: str,