浏览代码

HUE-8749 [catalog] Rename get_navigator_url() to get_catalog_url()

Romain Rigaux 6 年之前
父节点
当前提交
be77ac4

+ 5 - 5
apps/metastore/src/metastore/views.py

@@ -36,7 +36,7 @@ from beeswax.models import SavedQuery
 from beeswax.server import dbms
 from beeswax.server import dbms
 from beeswax.server.dbms import get_query_server_config
 from beeswax.server.dbms import get_query_server_config
 from desktop.lib.view_util import location_to_url
 from desktop.lib.view_util import location_to_url
-from metadata.conf import has_optimizer, has_catalog, get_optimizer_url, get_navigator_url
+from metadata.conf import has_optimizer, has_catalog, get_optimizer_url, get_catalog_url
 from notebook.connectors.base import Notebook, QueryError
 from notebook.connectors.base import Notebook, QueryError
 from notebook.models import make_notebook
 from notebook.models import make_notebook
 
 
@@ -89,7 +89,7 @@ def databases(request):
     'is_optimizer_enabled': has_optimizer(),
     'is_optimizer_enabled': has_optimizer(),
     'is_navigator_enabled': has_catalog(request.user),
     'is_navigator_enabled': has_catalog(request.user),
     'optimizer_url': get_optimizer_url(),
     'optimizer_url': get_optimizer_url(),
-    'navigator_url': get_navigator_url(),
+    'navigator_url': get_catalog_url(),
     'is_embeddable': request.GET.get('is_embeddable', False),
     'is_embeddable': request.GET.get('is_embeddable', False),
     'source_type': _get_servername(db),
     'source_type': _get_servername(db),
   })
   })
@@ -263,7 +263,7 @@ def show_tables(request, database=None):
     'is_optimizer_enabled': has_optimizer(),
     'is_optimizer_enabled': has_optimizer(),
     'is_navigator_enabled': has_catalog(request.user),
     'is_navigator_enabled': has_catalog(request.user),
     'optimizer_url': get_optimizer_url(),
     'optimizer_url': get_optimizer_url(),
-    'navigator_url': get_navigator_url(),
+    'navigator_url': get_catalog_url(),
     'is_embeddable': request.GET.get('is_embeddable', False),
     'is_embeddable': request.GET.get('is_embeddable', False),
     'source_type': _get_servername(db),
     'source_type': _get_servername(db),
     })
     })
@@ -348,7 +348,7 @@ def describe_table(request, database, table):
       'is_optimizer_enabled': has_optimizer(),
       'is_optimizer_enabled': has_optimizer(),
       'is_navigator_enabled': has_catalog(request.user),
       'is_navigator_enabled': has_catalog(request.user),
       'optimizer_url': get_optimizer_url(),
       'optimizer_url': get_optimizer_url(),
-      'navigator_url': get_navigator_url(),
+      'navigator_url': get_catalog_url(),
       'is_embeddable': request.GET.get('is_embeddable', False),
       'is_embeddable': request.GET.get('is_embeddable', False),
       'source_type': _get_servername(db),
       'source_type': _get_servername(db),
     })
     })
@@ -610,7 +610,7 @@ def describe_partitions(request, database, table):
         'is_optimizer_enabled': has_optimizer(),
         'is_optimizer_enabled': has_optimizer(),
         'is_navigator_enabled': has_catalog(request.user),
         'is_navigator_enabled': has_catalog(request.user),
         'optimizer_url': get_optimizer_url(),
         'optimizer_url': get_optimizer_url(),
-        'navigator_url': get_navigator_url(),
+        'navigator_url': get_catalog_url(),
         'is_embeddable': request.GET.get('is_embeddable', False),
         'is_embeddable': request.GET.get('is_embeddable', False),
         'source_type': _get_servername(db),
         'source_type': _get_servername(db),
     })
     })

+ 1 - 1
desktop/libs/metadata/src/metadata/catalog_api.py

@@ -366,7 +366,7 @@ def delete_tags(request):
   }
   }
 
 
   if not is_allowed:
   if not is_allowed:
-    raise Exception("The user does not have proper Hue permissions to delete %s tags." %  % interface.title())
+    raise Exception("The user does not have proper Hue permissions to delete %s tags." % interface.title())
   if not entity_id:
   if not entity_id:
     raise Exception("Missing required parameter 'id' in delete_tags API.")
     raise Exception("Missing required parameter 'id' in delete_tags API.")
   if not tags:
   if not tags:

+ 2 - 2
desktop/libs/metadata/src/metadata/conf.py

@@ -62,12 +62,12 @@ def has_workload_analytics():
   return bool(ALTUS.AUTH_KEY_ID.get()) and ALTUS.HAS_WA.get()
   return bool(ALTUS.AUTH_KEY_ID.get()) and ALTUS.HAS_WA.get()
 
 
 
 
-def get_navigator_url():
+def get_catalog_url():
   return NAVIGATOR.API_URL.get() and NAVIGATOR.API_URL.get().strip('/')[:-3]
   return NAVIGATOR.API_URL.get() and NAVIGATOR.API_URL.get().strip('/')[:-3]
 
 
 def has_catalog(user):
 def has_catalog(user):
   from desktop.auth.backend import is_admin
   from desktop.auth.backend import is_admin
-  return bool(get_navigator_url() and get_navigator_auth_password()) \
+  return bool(get_catalog_url() and get_navigator_auth_password()) \
       and (is_admin(user) or user.has_hue_permission(action="access", app=DJANGO_APPS[0]))
       and (is_admin(user) or user.has_hue_permission(action="access", app=DJANGO_APPS[0]))
 
 
 
 

+ 3 - 3
desktop/libs/notebook/src/notebook/views.py

@@ -31,7 +31,7 @@ from desktop.lib.json_utils import JSONEncoderForHTML
 from desktop.models import Document2, Document, FilesystemException
 from desktop.models import Document2, Document, FilesystemException
 from desktop.views import serve_403_error
 from desktop.views import serve_403_error
 
 
-from metadata.conf import has_optimizer, has_navigator, has_workload_analytics
+from metadata.conf import has_optimizer, has_catalog, has_workload_analytics
 
 
 from notebook.conf import get_ordered_interpreters, SHOW_NOTEBOOKS
 from notebook.conf import get_ordered_interpreters, SHOW_NOTEBOOKS
 from notebook.connectors.base import Notebook, get_api, _get_snippet_name
 from notebook.connectors.base import Notebook, get_api, _get_snippet_name
@@ -87,7 +87,7 @@ def notebook(request, is_embeddable=False):
           'session_properties': SparkApi.get_properties(),
           'session_properties': SparkApi.get_properties(),
           'is_optimizer_enabled': has_optimizer(),
           'is_optimizer_enabled': has_optimizer(),
           'is_wa_enabled': has_workload_analytics(),
           'is_wa_enabled': has_workload_analytics(),
-          'is_navigator_enabled': has_navigator(request.user),
+          'is_navigator_enabled': has_catalog(request.user),
           'editor_type': 'notebook'
           'editor_type': 'notebook'
       }),
       }),
       'is_yarn_mode': is_yarn_mode,
       'is_yarn_mode': is_yarn_mode,
@@ -126,7 +126,7 @@ def editor(request, is_mobile=False, is_embeddable=False):
         'mode': 'editor',
         'mode': 'editor',
         'is_optimizer_enabled': has_optimizer(),
         'is_optimizer_enabled': has_optimizer(),
         'is_wa_enabled': has_workload_analytics(),
         'is_wa_enabled': has_workload_analytics(),
-        'is_navigator_enabled': has_navigator(request.user),
+        'is_navigator_enabled': has_catalog(request.user),
         'editor_type': editor_type,
         'editor_type': editor_type,
         'mobile': is_mobile
         'mobile': is_mobile
       })
       })