Ver código fonte

HUE-8749 [catalog] Rename has_navigator() to has_catalog()

Romain Rigaux 6 anos atrás
pai
commit
932f8c8cc1

+ 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.dbms import get_query_server_config
 from desktop.lib.view_util import location_to_url
-from metadata.conf import has_optimizer, has_navigator, get_optimizer_url, get_navigator_url
+from metadata.conf import has_optimizer, has_catalog, get_optimizer_url, get_navigator_url
 from notebook.connectors.base import Notebook, QueryError
 from notebook.models import make_notebook
 
@@ -87,7 +87,7 @@ def databases(request):
     'partitions': [],
     'has_write_access': has_write_access(request.user),
     'is_optimizer_enabled': has_optimizer(),
-    'is_navigator_enabled': has_navigator(request.user),
+    'is_navigator_enabled': has_catalog(request.user),
     'optimizer_url': get_optimizer_url(),
     'navigator_url': get_navigator_url(),
     'is_embeddable': request.GET.get('is_embeddable', False),
@@ -261,7 +261,7 @@ def show_tables(request, database=None):
     'partitions': [],
     'has_write_access': has_write_access(request.user),
     'is_optimizer_enabled': has_optimizer(),
-    'is_navigator_enabled': has_navigator(request.user),
+    'is_navigator_enabled': has_catalog(request.user),
     'optimizer_url': get_optimizer_url(),
     'navigator_url': get_navigator_url(),
     'is_embeddable': request.GET.get('is_embeddable', False),
@@ -346,7 +346,7 @@ def describe_table(request, database, table):
       'database': database,
       'has_write_access': has_write_access(request.user),
       'is_optimizer_enabled': has_optimizer(),
-      'is_navigator_enabled': has_navigator(request.user),
+      'is_navigator_enabled': has_catalog(request.user),
       'optimizer_url': get_optimizer_url(),
       'navigator_url': get_navigator_url(),
       'is_embeddable': request.GET.get('is_embeddable', False),
@@ -608,7 +608,7 @@ def describe_partitions(request, database, table):
         'request': request,
         'has_write_access': has_write_access(request.user),
         'is_optimizer_enabled': has_optimizer(),
-        'is_navigator_enabled': has_navigator(request.user),
+        'is_navigator_enabled': has_catalog(request.user),
         'optimizer_url': get_optimizer_url(),
         'navigator_url': get_navigator_url(),
         'is_embeddable': request.GET.get('is_embeddable', False),

+ 3 - 3
desktop/core/src/desktop/api2.py

@@ -33,7 +33,7 @@ from django.utils.translation import ugettext as _
 from django.views.decorators.csrf import ensure_csrf_cookie
 from django.views.decorators.http import require_POST
 
-from metadata.conf import has_navigator
+from metadata.conf import has_catalog
 from metadata.catalog_api import search_entities as metadata_search_entities, _highlight, search_entities_interactive as metadata_search_entities_interactive
 from notebook.connectors.altus import SdxApi, AnalyticDbApi, DataEngApi, DataWarehouse2Api
 from notebook.connectors.base import Notebook
@@ -836,7 +836,7 @@ def search_entities(request):
 
     return JsonResponse(response)
   else:
-    if has_navigator(request.user):
+    if has_catalog(request.user):
       return metadata_search_entities(request)
     else:
       return JsonResponse({'status': 1, 'message': _('Navigator not enabled')})
@@ -867,7 +867,7 @@ def search_entities_interactive(request):
 
     return JsonResponse(response)
   else:
-    if has_navigator(request.user):
+    if has_catalog(request.user):
       return metadata_search_entities_interactive(request)
     else:
       return JsonResponse({'status': 1, 'message': _('Navigator not enabled')})

+ 1 - 1
desktop/core/src/desktop/templates/assist.mako

@@ -18,7 +18,7 @@
 from django.utils.translation import ugettext as _
 
 from filebrowser.conf import SHOW_UPLOAD_BUTTON
-from metadata.conf import has_navigator, OPTIMIZER
+from metadata.conf import has_catalog, OPTIMIZER
 from metastore.conf import ENABLE_NEW_CREATE_TABLE
 from notebook.conf import ENABLE_QUERY_BUILDER, ENABLE_QUERY_SCHEDULING, get_ordered_interpreters
 

+ 2 - 2
desktop/core/src/desktop/templates/global_js_constants.mako

@@ -24,7 +24,7 @@
   from beeswax.conf import LIST_PARTITIONS_LIMIT
   from dashboard.conf import HAS_SQL_ENABLED
   from indexer.conf import ENABLE_NEW_INDEXER
-  from metadata.conf import has_navigator, has_optimizer, has_workload_analytics, OPTIMIZER
+  from metadata.conf import has_catalog, has_optimizer, has_workload_analytics, OPTIMIZER
   from notebook.conf import ENABLE_QUERY_ANALYSIS, ENABLE_QUERY_SCHEDULING
 %>
 
@@ -60,7 +60,7 @@
 
   window.ENABLE_SQL_SYNTAX_CHECK = '${ conf.ENABLE_SQL_SYNTAX_CHECK.get() }' === 'True';
 
-  window.HAS_NAVIGATOR = '${ has_navigator(request.user) }' === 'True';
+  window.HAS_NAVIGATOR = '${ has_catalog(request.user) }' === 'True';
 
   window.HAS_OPTIMIZER = '${ has_optimizer() }' === 'True';
 

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

@@ -32,7 +32,7 @@ from desktop.lib.i18n import force_unicode, smart_str
 
 from metadata.catalog.base import get_api
 from metadata.catalog.navigator_client import CatalogApiException, CatalogEntityDoesNotExistException, CatalogAuthException
-from metadata.conf import has_navigator, NAVIGATOR, has_catalog_file_search
+from metadata.conf import has_catalog, NAVIGATOR, has_catalog_file_search
 
 
 LOG = logging.getLogger(__name__)
@@ -50,7 +50,7 @@ def error_handler(view_fn):
     }
 
     try:
-      if has_navigator(args[0].user):
+      if has_catalog(args[0].user):
         return view_fn(*args, **kwargs)
       else:
         raise MetadataApiException('Navigator API is not configured.')

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

@@ -31,7 +31,7 @@ from desktop.lib.test_utils import add_to_group, grant_access
 from hadoop.pseudo_hdfs4 import is_live_cluster
 
 from metadata import conf
-from metadata.conf import has_navigator, NAVIGATOR, get_navigator_auth_password, get_navigator_auth_username
+from metadata.conf import has_catalog, NAVIGATOR, get_navigator_auth_password, get_navigator_auth_username
 from metadata.catalog_api import _augment_highlighting
 from metadata.catalog.navigator_client import NavigatorApi
 
@@ -49,7 +49,7 @@ class TestNavigator(object):
     add_to_group('test')
     grant_access("test", "test", "metadata")
 
-    if not is_live_cluster() or not has_navigator(cls.user):
+    if not is_live_cluster() or not has_catalog(cls.user):
       raise SkipTest
 
     cls.api = NavigatorApi(cls.user)

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

@@ -65,7 +65,7 @@ def has_workload_analytics():
 def get_navigator_url():
   return NAVIGATOR.API_URL.get() and NAVIGATOR.API_URL.get().strip('/')[:-3]
 
-def has_navigator(user):
+def has_catalog(user):
   from desktop.auth.backend import is_admin
   return bool(get_navigator_url() and get_navigator_auth_password()) \
       and (is_admin(user) or user.has_hue_permission(action="access", app=DJANGO_APPS[0]))
@@ -265,7 +265,7 @@ def get_navigator_saml_password():
 
 
 def has_catalog_file_search(user):
-  return has_navigator(user) and NAVIGATOR.ENABLE_FILE_SEARCH.get()
+  return has_catalog(user) and NAVIGATOR.ENABLE_FILE_SEARCH.get()
 
 
 NAVIGATOR = ConfigSection(

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

@@ -32,7 +32,7 @@ from libzookeeper.conf import zkensemble
 from indexer.conf import config_morphline_path
 
 from metadata.catalog.navigator_client import CatalogApiException
-from metadata.conf import has_navigator
+from metadata.conf import has_catalog
 from metadata.manager_client import ManagerApi
 
 
@@ -47,7 +47,7 @@ def error_handler(view_fn):
     }
 
     try:
-      if has_navigator(args[0].user): # TODO
+      if has_catalog(args[0].user): # TODO
         return view_fn(*args, **kwargs)
       else:
         raise CatalogApiException('Navigator API is not configured.')