[zeppelin] branch master updated: [ZEPPELIN-4364]credentials.json should use Hadoop Config Storage

[zjffdu]

This is an automated email from the ASF dual-hosted git repository.

zjffdu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git


The following commit(s) were added to refs/heads/master by this push:
     new fdaba54  [ZEPPELIN-4364]credentials.json should use Hadoop Config 
Storage
fdaba54 is described below

commit fdaba544f197aab4c66830745c4835013843163d
Author: Long Le Xich <codename...@users.noreply.github.com>
AuthorDate: Wed Oct 2 16:43:44 2019 +0800

    [ZEPPELIN-4364]credentials.json should use Hadoop Config Storage
    
    ### What is this PR for?
    As described in 
https://medium.com/zjffdu/zeppelin-0-8-0-new-features-ea53e8810235. when 
`zeppelin.config.storage.class` set to 
`org.apache.zeppelin.storage.FileSystemConfigStorage`
    `interpreter.json, notebook-authorization.json , credentials.json` should 
use Hadoop Config Storage instead. This PR is for fixing `credentials.json` 
does not work with that setting.
    ### What type of PR is it?
    Bug Fix
    
    ### Todos
    * [x] - Fix credentials.json does not get stored on HDFS
    
    ### What is the Jira issue?
    https://issues.apache.org/jira/browse/ZEPPELIN-4364
    ### How should this be tested?
    Automatically tested.
    
    ### Screenshots (if appropriate)
    
    ### Questions:
    * Does the licenses files need update? No
    * Is there breaking changes for older versions? No
    * Does this needs documentation? No
    
    Author: Long Le Xich <codename...@users.noreply.github.com>
    
    Closes #3472 from codenamelxl/change-credentials-json-path and squashes the 
following commits:
    
    14d31d569 [Long Le Xich] credentials.json should use Hadoop Config Storage
---
 .../src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
 
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
index 88b8e3c..db6f09d 100644
--- 
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
+++ 
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
@@ -521,7 +521,7 @@ public class ZeppelinConfiguration extends XMLConfiguration 
{
   }
 
   public String getCredentialsPath() {
-    return getRelativeDir(String.format("%s/credentials.json", getConfDir()));
+    return getConfigFSDir() + "/credentials.json";
   }
 
   public String getShiroPath() {