|
|
@@ -40,7 +40,7 @@ from django.contrib.staticfiles.storage import staticfiles_storage
|
|
|
from django.urls import reverse, NoReverseMatch
|
|
|
|
|
|
from dashboard.conf import get_engines, HAS_REPORT_ENABLED, IS_ENABLED as DASHBOARD_ENABLED
|
|
|
-from hadoop.core_site import get_raz_api_url, get_raz_default_endpoint
|
|
|
+from hadoop.core_site import get_raz_api_url, get_raz_s3_default_bucket
|
|
|
from kafka.conf import has_kafka
|
|
|
from indexer.conf import ENABLE_DIRECT_UPLOAD
|
|
|
from metadata.conf import get_optimizer_mode
|
|
|
@@ -926,7 +926,8 @@ class FilesystemException(Exception):
|
|
|
|
|
|
class Document2QueryMixin(object):
|
|
|
|
|
|
- def documents(self, user, perms='both', include_history=False, include_trashed=False, include_managed=False, include_shared_links=False, allow_distinct=True):
|
|
|
+ def documents(self, user, perms='both', include_history=False, include_trashed=False, include_managed=False,
|
|
|
+ include_shared_links=False, allow_distinct=True):
|
|
|
"""
|
|
|
Returns all documents that are owned or shared with the user.
|
|
|
:param perms: both, shared, owned. Defaults to both.
|
|
|
@@ -1729,8 +1730,8 @@ def get_remote_home_storage():
|
|
|
remote_home_storage = REMOTE_STORAGE_HOME.get() if hasattr(REMOTE_STORAGE_HOME, 'get') and REMOTE_STORAGE_HOME.get() else None
|
|
|
|
|
|
if not remote_home_storage:
|
|
|
- if get_raz_api_url() and get_raz_default_endpoint():
|
|
|
- remote_home_storage = 's3a://%(bucket)s' % get_raz_default_endpoint()
|
|
|
+ if get_raz_api_url() and get_raz_s3_default_bucket():
|
|
|
+ remote_home_storage = 's3a://%(bucket)s' % get_raz_s3_default_bucket()
|
|
|
|
|
|
return remote_home_storage
|
|
|
|
|
|
@@ -1849,7 +1850,7 @@ class ClusterConfig(object):
|
|
|
'name': interpreter['name'],
|
|
|
'type': interpreter['type'], # Connector v1
|
|
|
'id': interpreter['type'],
|
|
|
- 'displayName': 'Unified Analytics' if ENABLE_UNIFIED_ANALYTICS.get() and interpreter['dialect'] == 'hive' else interpreter['name'],
|
|
|
+ 'displayName': 'Unified Analytics' if ENABLE_UNIFIED_ANALYTICS.get() and interpreter['dialect'] == 'hive' else interpreter['name'],
|
|
|
'buttonName': _('Query'),
|
|
|
'tooltip': _('%s Query') % interpreter['type'].title(),
|
|
|
'optimizer': get_optimizer_mode(),
|
|
|
@@ -1905,7 +1906,7 @@ class ClusterConfig(object):
|
|
|
'name': interpreter['name'],
|
|
|
'type': interpreter['type'],
|
|
|
'id': interpreter['type'],
|
|
|
- 'displayName': 'Unified Analytics' if ENABLE_UNIFIED_ANALYTICS.get() and interpreter['dialect'] == 'hive' else interpreter['name'],
|
|
|
+ 'displayName': 'Unified Analytics' if ENABLE_UNIFIED_ANALYTICS.get() and interpreter['dialect'] == 'hive' else interpreter['name'],
|
|
|
'buttonName': _('Query'),
|
|
|
'tooltip': _('%s Query') % interpreter['type'].title(),
|
|
|
'page': '/editor/?type=%(type)s' % interpreter,
|