ソースを参照

HUE-7420 [adls] replaced REFRESH_URL for TENANT_ID

jdesjean 8 年 前
コミット
13eebe0

+ 3 - 9
desktop/conf.dist/hue.ini

@@ -1461,19 +1461,13 @@
       # Azure credentials
       ## client_id=
       ## client_secret=
-      ## refresh_url=https://login.microsoftonline.com/<tenant_id>/oauth2/token
-
-      # Endpoint overrides
-      ## proxy_address=
-      ## proxy_port=8080
-      ## proxy_user=
-      ## proxy_pass=
+      ## tenant_id=
 
   [[adls_clusters]]
     # Default ADLS cluster
     [[[default]]]
-      # fs_defaultfs=adl://<account_name>.azuredatalakestore.net
-      # webhdfs_url=https://<account_name>.azuredatalakestore.net/webhdfs/v1
+      ## fs_defaultfs=adl://<account_name>.azuredatalakestore.net
+      ## webhdfs_url=https://<account_name>.azuredatalakestore.net/webhdfs/v1
 
 ###########################################################################
 # Settings for the Sentry lib

+ 3 - 9
desktop/conf/pseudo-distributed.ini.tmpl

@@ -1463,19 +1463,13 @@
       # Azure credentials
       ## client_id=
       ## client_secret=
-      ## refresh_url=https://login.microsoftonline.com/<tenant_id>/oauth2/token
-
-      # Endpoint overrides
-      ## proxy_address=
-      ## proxy_port=8080
-      ## proxy_user=
-      ## proxy_pass=
+      ## tenant_id=
 
   [[adls_clusters]]
     # Default ADLS cluster
     [[[default]]]
-      # fs_defaultfs=adl://<account_name>.azuredatalakestore.net
-      # webhdfs_url=https://<account_name>.azuredatalakestore.net/webhdfs/v1
+      ## fs_defaultfs=adl://<account_name>.azuredatalakestore.net
+      ## webhdfs_url=https://<account_name>.azuredatalakestore.net/webhdfs/v1
 
 ###########################################################################
 # Settings for the Sentry lib

+ 1 - 1
desktop/libs/azure/src/azure/active_directory.py

@@ -18,7 +18,7 @@ from __future__ import absolute_import
 import logging
 
 from time import time
-from azure.conf import get_default_region, get_default_client_id, get_default_authentication_code, get_default_refresh_url, get_default_grant_type
+from azure.conf import get_default_region, get_default_client_id, get_default_authentication_code, get_default_refresh_url
 from desktop.lib.rest import http_client, resource
 
 LOG = logging.getLogger(__name__)

+ 5 - 10
desktop/libs/azure/src/azure/conf.py

@@ -20,11 +20,13 @@ import re
 
 from django.utils.translation import ugettext_lazy as _, ugettext as _t
 from desktop.lib.conf import Config, UnspecifiedConfigSection, ConfigSection, coerce_bool, coerce_password_from_script
-from hadoop.core_site import get_adls_client_id, get_adls_authentication_code, get_adls_refresh_url, get_adls_grant_type
+from hadoop.core_site import get_adls_client_id, get_adls_authentication_code, get_adls_refresh_url
 
 
 LOG = logging.getLogger(__name__)
 
+REFRESH_URL = 'https://login.microsoftonline.com/<tenant_id>/oauth2/token'
+
 
 def get_default_client_id():
   """
@@ -42,14 +44,10 @@ def get_default_authentication_code():
   return client_secret_script or get_adls_authentication_code()
 
 def get_default_refresh_url():
-  refresh_url = AZURE_ACCOUNTS['default'].REFRESH_URL.get()
+  refresh_url = REFRESH_URL.replace('<tenant_id>', AZURE_ACCOUNTS['default'].TENANT_ID.get())
   refresh_url = refresh_url if refresh_url else get_adls_refresh_url()
   return refresh_url or get_adls_refresh_url()
 
-def get_default_grant_type():
-  grant_type = AZURE_ACCOUNTS['default'].GRANT_TYPE.get()
-  return grant_type or get_adls_grant_type()
-
 def get_default_region():
   return ""
 
@@ -81,10 +79,7 @@ AZURE_ACCOUNTS = UnspecifiedConfigSection(
     members=dict(
       CLIENT_ID=Config("client_id", help="", default=None),
       CLIENT_SECRET=Config("client_secret", help="", default=None),
-      REFRESH_URL=Config("refresh_url",help="https://login.microsoftonline.com/<tenant_id>/oauth2/token", default=None),
-      GRANT_TYPE=Config("grant_type",
-                         help="",
-                         type=str, default="client_credentials")
+      TENANT_ID=Config("tenant_id", help="", default=None)
     )
   )
 )