Browse Source

[abfs] Turn on when cluster config and RAZ are on

Romain Rigaux 4 years ago
parent
commit
fac608fee6
1 changed files with 4 additions and 1 deletions
  1. 4 1
      desktop/libs/azure/src/azure/conf.py

+ 4 - 1
desktop/libs/azure/src/azure/conf.py

@@ -154,8 +154,11 @@ def is_adls_enabled():
     or (conf_idbroker.is_idbroker_enabled('azure') and has_azure_metadata())) and 'default' in list(ADLS_CLUSTERS.keys())
     or (conf_idbroker.is_idbroker_enabled('azure') and has_azure_metadata())) and 'default' in list(ADLS_CLUSTERS.keys())
 
 
 def is_abfs_enabled():
 def is_abfs_enabled():
+  from desktop.conf import RAZ  # Must be imported dynamically in order to have proper value
+  
   return ('default' in list(AZURE_ACCOUNTS.keys()) and AZURE_ACCOUNTS['default'].get_raw() and AZURE_ACCOUNTS['default'].CLIENT_ID.get() \
   return ('default' in list(AZURE_ACCOUNTS.keys()) and AZURE_ACCOUNTS['default'].get_raw() and AZURE_ACCOUNTS['default'].CLIENT_ID.get() \
-    or (conf_idbroker.is_idbroker_enabled('azure') and has_azure_metadata())) and 'default' in list(ABFS_CLUSTERS.keys())
+    or (conf_idbroker.is_idbroker_enabled('azure') and has_azure_metadata())) and 'default' in list(ABFS_CLUSTERS.keys()) \
+    or (RAZ.IS_ENABLED.get() and 'default' in list(ABFS_CLUSTERS.keys()))
 
 
 def has_adls_access(user):
 def has_adls_access(user):
   from desktop.auth.backend import is_admin
   from desktop.auth.backend import is_admin