[zeppelin] branch master updated: [ZEPPELIN-5184] Update related to entity name of credentials

[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 bcb5cd4  [ZEPPELIN-5184] Update related to entity name of credentials
bcb5cd4 is described below

commit bcb5cd436a9820070f711454e91e361bd633d19f
Author: sooyeon shin <comma...@gmail.com>
AuthorDate: Wed Dec 30 23:10:57 2020 +0900

    [ZEPPELIN-5184] Update related to entity name of credentials
    
    ### What is this PR for?
    The entity name of the credential has changed.
    Please refer to these. https://github.com/apache/zeppelin/pull/3806, 
https://github.com/apache/zeppelin/pull/4008.
    The documentation and web UI need to be updated.
    Change the entity name from [Interpreter Group].[Interpreter Name] to 
[Interpreter Name].
    
    ### What type of PR is it?
    [Improvement | Documentation]
    
    ### Todos
    * [ ] - Task
    
    ### What is the Jira issue?
    * https://issues.apache.org/jira/browse/ZEPPELIN-5184
    
    ### How should this be tested?
    Access the web page.
    
    ### Screenshots (if appropriate)
    #### Web UI
    - http://[zeppelin-server]:[zeppelin-port]/#/credential
    - Change the entity name from [Interpreter Group].[Interpreter Name] to 
[Interpreter Name].
    - default UI
      - before
        <img width="400" alt="default_before1" 
src="https://user-images.githubusercontent.com/1809185/103356944-6234c300-4af5-11eb-9608-a392fb4e084e.png";>
        <img width="400" alt="default_before2" 
src="https://user-images.githubusercontent.com/1809185/103356949-6365f000-4af5-11eb-8f53-9dd20ff6fcae.png";>
      - after
        <img width="400" alt="default_after1" 
src="https://user-images.githubusercontent.com/1809185/103357068-a32cd780-4af5-11eb-8ec1-0108d2d7fcb4.png";>
        <img width="400" alt="default_after2" 
src="https://user-images.githubusercontent.com/1809185/103357069-a3c56e00-4af5-11eb-8db5-86c506e3389a.png";>
    - next UI
      - before
        <img width="400" alt="nextui_before" 
src="https://user-images.githubusercontent.com/1809185/103357127-c22b6980-4af5-11eb-90ba-93e80dc5e35b.png";>
      - after
        <img width="400" alt="nextui_after" 
src="https://user-images.githubusercontent.com/1809185/103357134-c6578700-4af5-11eb-8adb-548c0165db03.png";>
    
    #### Documentation
    - 
http://[zeppelin-doc-server]:[zeppelin-doc-port]/setup/security/datasource_authorization.html#how-to-save-the-credential-information
    - Change the entity name from [Interpreter Group].[Interpreter Name] to 
[Interpreter Name].
      - before
        <img width="600" alt="doc_before1" 
src="https://user-images.githubusercontent.com/1809185/103357881-9ad59c00-4af7-11eb-8a61-3c5b869aecab.png";>
      - after
        <img width="600" alt="doc_after1" 
src="https://user-images.githubusercontent.com/1809185/103357912-a923b800-4af7-11eb-9929-445fe20a754e.png";>
    
    - 
http://[zeppelin-doc-server]:[zeppelin-doc-port]/usage/interpreter/overview.html#credential-injection
    - Fix broken image
      - before
        <img width="600" alt="doc_before2" 
src="https://user-images.githubusercontent.com/1809185/103357948-c35d9600-4af7-11eb-9491-ce8a834b56b0.png";>
      - after
        <img width="852" alt="doc_after2" 
src="https://user-images.githubusercontent.com/1809185/103357967-ceb0c180-4af7-11eb-9aec-b25b5ae89557.png";>
    
    ### Questions:
    * Does the licenses files need update? N
    * Is there breaking changes for older versions? N
    * Does this needs documentation? Y
    
    Author: sooyeon shin <comma...@gmail.com>
    
    Closes #4009 from comma337/hotfix/ZEPPELIN-5184 and squashes the following 
commits:
    
    316a45439 [sooyeon shin] Fix merge error
    9f7ca99dc [sooyeon shin] Fix broken image
    16f70e8a4 [sooyeon shin] Change the entity name from [Interpreter 
Group].[Interpreter Name] to [Interpreter Name]
---
 docs/_config.yml                                   |   8 --------
 .../zeppelin/img/docs-img/add_credential.png       | Bin 56795 -> 159117 bytes
 ...etting.PNG => credential_setting_injection.png} | Bin
 docs/setup/security/datasource_authorization.md    |   3 +--
 docs/usage/interpreter/overview.md                 |   2 +-
 .../workspace/credential/credential.component.html |   2 +-
 .../workspace/credential/credential.component.ts   |   2 +-
 .../src/app/credential/credential.controller.js    |   2 +-
 zeppelin-web/src/app/credential/credential.html    |   2 +-
 9 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/docs/_config.yml b/docs/_config.yml
index 4737696..f1f3bb0 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -21,11 +21,7 @@ author :
   twitter : ASF
   feedburner : feedname
 
-<<<<<<< Updated upstream
-ZEPPELIN_VERSION : 0.9.0-SNAPSHOT
-=======
 ZEPPELIN_VERSION : 0.10.0-SNAPSHOT
->>>>>>> Stashed changes
 
 # The production_url is only used when full-domain names are needed
 # such as sitemap.txt
@@ -63,11 +59,7 @@ JB :
   #   - Only the following values are falsy: ["", null, false]
   #   - When setting BASE_PATH it must be a valid url.
   #     This means always setting the protocol (http|https) or prefixing with 
"/"
-<<<<<<< Updated upstream
-  BASE_PATH : /docs/0.9.0-SNAPSHOT
-=======
   BASE_PATH : /docs/0.10.0-SNAPSHOT
->>>>>>> Stashed changes
 
   # By default, the asset_path is automatically defined relative to BASE_PATH 
plus the enabled theme.
   # ex: [BASE_PATH]/assets/themes/[THEME-NAME]
diff --git a/docs/assets/themes/zeppelin/img/docs-img/add_credential.png 
b/docs/assets/themes/zeppelin/img/docs-img/add_credential.png
index 102b3ec..6fc3fdf 100644
Binary files a/docs/assets/themes/zeppelin/img/docs-img/add_credential.png and 
b/docs/assets/themes/zeppelin/img/docs-img/add_credential.png differ
diff --git 
a/docs/assets/themes/zeppelin/img/screenshots/credential_injection_setting.PNG 
b/docs/assets/themes/zeppelin/img/screenshots/credential_setting_injection.png
similarity index 100%
rename from 
docs/assets/themes/zeppelin/img/screenshots/credential_injection_setting.PNG
rename to 
docs/assets/themes/zeppelin/img/screenshots/credential_setting_injection.png
diff --git a/docs/setup/security/datasource_authorization.md 
b/docs/setup/security/datasource_authorization.md
index 8206c89..3cf1788 100644
--- a/docs/setup/security/datasource_authorization.md
+++ b/docs/setup/security/datasource_authorization.md
@@ -37,8 +37,7 @@ You can add new credentials in the dropdown menu for your 
data source which can
 
 <img class="img-responsive" 
src="{{BASE_PATH}}/assets/themes/zeppelin/img/docs-img/credential_tab.png" 
width="180px"/>
 
-**Entity** can be the key that distinguishes each credential sets.(We suggest 
that the convention of the **Entity** is `[Interpreter Group].[Interpreter 
Name]`.)
-Please see [what is interpreter 
group](../../usage/interpreter/overview.html#what-is-interpreter-group) for the 
detailed information.
+**Entity** can be the key that distinguishes each credential sets.(We suggest 
that the convention of the **Entity** is `Interpreter Name`.)
 
 Type **Username & Password** for your own credentials. ex) Mysql user & 
password of the JDBC Interpreter.
 
diff --git a/docs/usage/interpreter/overview.md 
b/docs/usage/interpreter/overview.md
index 9087877..2ba9d8e 100644
--- a/docs/usage/interpreter/overview.md
+++ b/docs/usage/interpreter/overview.md
@@ -140,7 +140,7 @@ Snippet of code (language of interpreter) that executes 
after initialization of
 Credentials from the credential manager can be injected into Notebooks. 
Credential injection works by replacing the following patterns in Notebooks 
with matching credentials for the Credential Manager: 
`{CREDENTIAL_ENTITY.user}` and `{CREDENTIAL_ENTITY.password}`. However, 
credential injection must be enabled per Interpreter, by adding a boolean 
`injectCredentials` setting in the Interpreters configuration. Injected 
passwords are removed from Notebook output to prevent accidentally leaki [...]
 
 **Credential Injection Setting**
-<img 
src="{{BASE_PATH}}/assets/themes/zeppelin/img/screenshots/credential_injection_setting.png"
 width="500px">
+<img 
src="{{BASE_PATH}}/assets/themes/zeppelin/img/screenshots/credential_setting_injection.png"
 width="620px">
 
 **Credential Entry Example**
 <img 
src="{{BASE_PATH}}/assets/themes/zeppelin/img/screenshots/credential_entry.png" 
width="500px">
diff --git 
a/zeppelin-web-angular/src/app/pages/workspace/credential/credential.component.html
 
b/zeppelin-web-angular/src/app/pages/workspace/credential/credential.component.html
index 51b0c84..d075d03 100644
--- 
a/zeppelin-web-angular/src/app/pages/workspace/credential/credential.component.html
+++ 
b/zeppelin-web-angular/src/app/pages/workspace/credential/credential.component.html
@@ -49,7 +49,7 @@
                      (input)="onEntityInput($event)"
                      formControlName="entity"
                      nz-input
-                     placeholder="[Group].[Name]"/>
+                     placeholder="Interpreter Name"/>
               <nz-autocomplete nzBackfill #auto>
                 <nz-auto-option *ngFor="let option of 
interpreterFilteredNames" [nzValue]="option">
                   {{ option }}
diff --git 
a/zeppelin-web-angular/src/app/pages/workspace/credential/credential.component.ts
 
b/zeppelin-web-angular/src/app/pages/workspace/credential/credential.component.ts
index b28a6a6..ff1a6b8 100644
--- 
a/zeppelin-web-angular/src/app/pages/workspace/credential/credential.component.ts
+++ 
b/zeppelin-web-angular/src/app/pages/workspace/credential/credential.component.ts
@@ -156,7 +156,7 @@ export class CredentialComponent implements OnInit {
 
   getInterpreterNames() {
     this.interpreterService.getInterpretersSetting().subscribe(data => {
-      this.interpreterNames = data.map(e => `${e.group}.${e.name}`);
+      this.interpreterNames = data.map(e => `${e.name}`);
       this.interpreterFilteredNames = this.interpreterNames.slice(0, 10);
       this.cdr.markForCheck();
     });
diff --git a/zeppelin-web/src/app/credential/credential.controller.js 
b/zeppelin-web/src/app/credential/credential.controller.js
index 350a046..020ae85 100644
--- a/zeppelin-web/src/app/credential/credential.controller.js
+++ b/zeppelin-web/src/app/credential/credential.controller.js
@@ -96,7 +96,7 @@ function CredentialController($scope, $rootScope, $http, 
baseUrlSrv, ngToast) {
       .success(function(data, status, headers, config) {
         for (let setting = 0; setting < data.body.length; setting++) {
           $scope.availableInterpreters.push(
-            data.body[setting].group + '.' + data.body[setting].name);
+            data.body[setting].name);
         }
         angular.element('#entityname').autocomplete({
           source: $scope.availableInterpreters,
diff --git a/zeppelin-web/src/app/credential/credential.html 
b/zeppelin-web/src/app/credential/credential.html
index 7c9414d..c2dbc54 100644
--- a/zeppelin-web/src/app/credential/credential.html
+++ b/zeppelin-web/src/app/credential/credential.html
@@ -59,7 +59,7 @@ limitations under the License.
                 </thead>
                 <tr>
                   <td>
-                    <input id="entityname" ng-model="entity" 
placeholder="[Interpreter Group].[Interpreter Name]"/>
+                    <input id="entityname" ng-model="entity" 
placeholder="Interpreter Name"/>
                   </td>
                   <td>
                     <textarea msd-elastic ng-model="username"></textarea>