KNOX-1176 - Update provider configuration references if new reference is invalid
Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/cf768a74 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/cf768a74 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/cf768a74 Branch: refs/heads/master Commit: cf768a74da3da2c00d158ba6aeb38751b6c3510c Parents: d402f6d Author: Phil Zampino <[email protected]> Authored: Tue Feb 20 15:15:05 2018 -0500 Committer: Phil Zampino <[email protected]> Committed: Tue Feb 20 20:39:10 2018 -0500 ---------------------------------------------------------------------- .../resource-detail.component.html | 36 ++++- .../applications/admin-ui/app/index.html | 2 +- .../app/inline.49eec4a5979db513c1fa.bundle.js | 1 + .../app/inline.b4085b145a2e0a0b720b.bundle.js | 1 - .../app/main.968fcdd54b9465154f6c.bundle.js | 1 - .../app/main.a4b4cc18906d76011422.bundle.js | 1 + .../topology/impl/DefaultTopologyService.java | 12 ++ .../simple/SimpleDescriptorHandler.java | 94 +++++------ .../gateway/GatewayAdminTopologyFuncTest.java | 159 +++++++++++++++++-- 9 files changed, 244 insertions(+), 63 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/cf768a74/gateway-admin-ui/src/app/resource-detail/resource-detail.component.html ---------------------------------------------------------------------- diff --git a/gateway-admin-ui/src/app/resource-detail/resource-detail.component.html b/gateway-admin-ui/src/app/resource-detail/resource-detail.component.html index 810f8b9..a47ac05 100644 --- a/gateway-admin-ui/src/app/resource-detail/resource-detail.component.html +++ b/gateway-admin-ui/src/app/resource-detail/resource-detail.component.html @@ -323,7 +323,13 @@ <div class="panel-body" *ngIf="isShowServiceDiscovery()"> <table class="table table-sm"> <tr> - <td width="20%"><strong>Address</strong></td> + <td width="20%"> + <span [class]="!editModeAddress && !descriptor.discoveryAddress ? 'inline-editable' : ''" + (click)="editModeAddress=true"> + <strong>Address</strong> + </span> + <span *ngIf="!editModeAddress && !descriptor.discoveryAddress"> </span> + </td> <td> <span class="inline-editable" (click)="editModeAddress=true" @@ -340,7 +346,13 @@ </td> </tr> <tr> - <td width="20%"><strong>Cluster</strong></td> + <td width="20%"> + <span [class]="!editModeCluster && !descriptor.discoveryCluster ? 'inline-editable' : ''" + (click)="editModeCluster=true"> + <strong>Cluster</strong> + </span> + <span *ngIf="!editModeCluster && !descriptor.discoveryCluster"> </span> + </td> <td> <span class="inline-editable" (click)="editModeCluster=true" @@ -357,11 +369,17 @@ </td> </tr> <tr> - <td width="20%"><strong>Username</strong></td> + <td width="20%"> + <span [class]="!editModeUser && !descriptor.discoveryUser ? 'inline-editable' : ''" + (click)="editModeUser=true"> + <strong>Username</strong> + </span> + <span *ngIf="!editModeUser && !descriptor.discoveryUser"> </span> + </td> <td> <span class="inline-editable" (click)="editModeUser=true" - *ngIf="!editModeUser">{{(descriptor.discoveryUser) ? descriptor.discoveryUser : 'unspecified'}}</span> + *ngIf="!editModeUser">{{ descriptor.discoveryUser }}</span> <span *ngIf="editModeUser" class="inline-editor inlineEditForm"> <input type="text" size="40" [(ngModel)]="descriptor.discoveryUser"> <button class="btn btn-xs" (click)="editModeUser=false;descriptor.setDirty()"> @@ -374,11 +392,17 @@ </td> </tr> <tr> - <td width="20%"><strong>Password Alias</strong></td> + <td width="20%"> + <span [class]="!editModeAlias && !descriptor.discoveryPassAlias ? 'inline-editable' : ''" + (click)="editModeAlias=true"> + <strong>Password Alias</strong> + </span> + <span *ngIf="!editModeAlias && !descriptor.discoveryPassAlias"> </span> + </td> <td> <span class="inline-editable" (click)="editModeAlias=true" - *ngIf="!editModeAlias">{{ (descriptor.discoveryPassAlias) ? descriptor.discoveryPassAlias : 'ambari.discovery.password' }}</span> + *ngIf="!editModeAlias">{{ descriptor.discoveryPassAlias }}</span> <span *ngIf="editModeAlias" class="inline-editor inlineEditForm"> <input type="text" size="40" [(ngModel)]="descriptor.discoveryPassAlias"> <button class="btn btn-xs" (click)="editModeAlias=false;descriptor.setDirty()"> http://git-wip-us.apache.org/repos/asf/knox/blob/cf768a74/gateway-applications/src/main/resources/applications/admin-ui/app/index.html ---------------------------------------------------------------------- diff --git a/gateway-applications/src/main/resources/applications/admin-ui/app/index.html b/gateway-applications/src/main/resources/applications/admin-ui/app/index.html index c96c061..31ae661 100644 --- a/gateway-applications/src/main/resources/applications/admin-ui/app/index.html +++ b/gateway-applications/src/main/resources/applications/admin-ui/app/index.html @@ -11,4 +11,4 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---><!doctype html><html><head><meta charset="utf-8"><title>Apache Knox Manager</title><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" type="image/x-icon" href="favicon.ico"><meta name="viewport" content="width=device-width,initial-scale=1"><!-- Latest compiled and minified CSS --><link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"; integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"><!-- Optional theme --><link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css"; integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous"><!-- Custom styles for this template --><link href="assets/sticky-footer.css" rel="stylesheet"><script src="https://ajax.googleapis.com/ajax/libs/jquery/3.0.0/jquery.min.js";></script><!-- Latest compiled and minified JavaScript --><scr ipt src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"; integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script><script src="assets/vkbeautify.js"></script><link href="styles.2ee5b7f4cd59a6cf015e.bundle.css" rel="stylesheet"/></head><body><div class="navbar-wrapper"><div class="container-fluid"><nav class="navbar navbar-inverse navbar-static-top"><div class="container-fluid"><div class="navbar-header"><button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"><span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span></button> <a class="navbar-brand" href="#"><img style="max-width:200px; margin-top: -9px;" src="assets/knox-logo-transparent.gif" alt="Apache Knox Manager"></a></div></div></nav></div><!-- Content --><resource-management></res ource-management><footer class="footer"><div>Knox Manager Version 0.1.0</div><gateway-version></gateway-version></footer><script type="text/javascript" src="inline.b4085b145a2e0a0b720b.bundle.js"></script><script type="text/javascript" src="scripts.c50bb762c438ae0f8842.bundle.js"></script><script type="text/javascript" src="main.968fcdd54b9465154f6c.bundle.js"></script></div></body></html> \ No newline at end of file +--><!doctype html><html><head><meta charset="utf-8"><title>Apache Knox Manager</title><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" type="image/x-icon" href="favicon.ico"><meta name="viewport" content="width=device-width,initial-scale=1"><!-- Latest compiled and minified CSS --><link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"; integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"><!-- Optional theme --><link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css"; integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous"><!-- Custom styles for this template --><link href="assets/sticky-footer.css" rel="stylesheet"><script src="https://ajax.googleapis.com/ajax/libs/jquery/3.0.0/jquery.min.js";></script><!-- Latest compiled and minified JavaScript --><scr ipt src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"; integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script><script src="assets/vkbeautify.js"></script><link href="styles.2ee5b7f4cd59a6cf015e.bundle.css" rel="stylesheet"/></head><body><div class="navbar-wrapper"><div class="container-fluid"><nav class="navbar navbar-inverse navbar-static-top"><div class="container-fluid"><div class="navbar-header"><button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"><span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span></button> <a class="navbar-brand" href="#"><img style="max-width:200px; margin-top: -9px;" src="assets/knox-logo-transparent.gif" alt="Apache Knox Manager"></a></div></div></nav></div><!-- Content --><resource-management></res ource-management><footer class="footer"><div>Knox Manager Version 0.1.0</div><gateway-version></gateway-version></footer><script type="text/javascript" src="inline.49eec4a5979db513c1fa.bundle.js"></script><script type="text/javascript" src="scripts.c50bb762c438ae0f8842.bundle.js"></script><script type="text/javascript" src="main.a4b4cc18906d76011422.bundle.js"></script></div></body></html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/knox/blob/cf768a74/gateway-applications/src/main/resources/applications/admin-ui/app/inline.49eec4a5979db513c1fa.bundle.js ---------------------------------------------------------------------- diff --git a/gateway-applications/src/main/resources/applications/admin-ui/app/inline.49eec4a5979db513c1fa.bundle.js b/gateway-applications/src/main/resources/applications/admin-ui/app/inline.49eec4a5979db513c1fa.bundle.js new file mode 100644 index 0000000..36c7e4b --- /dev/null +++ b/gateway-applications/src/main/resources/applications/admin-ui/app/inline.49eec4a5979db513c1fa.bundle.js @@ -0,0 +1 @@ +!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,u){for(var a,i,f,l=0,s=[];l<r.length;l++)t[i=r[l]]&&s.push(t[i][0]),t[i]=0;for(a in c)Object.prototype.hasOwnProperty.call(c,a)&&(e[a]=c[a]);for(n&&n(r,c,u);s.length;)s.shift()();if(u)for(l=0;l<u.length;l++)f=o(o.s=u[l]);return f};var r={},t={2:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],u=document.createElement("script");u.type="text/javascript",u.charset="utf-8",u.async=!0,u.timeout=12e4,o.nc&&u.setAttribute("nonce",o.nc),u.src=o.p+""+e+"."+{0:"a4b4cc18906d76011422",1:"aed76669724804835353"}[e]+".chunk.js";var a=setTimeout(i,12e4);function i(){u.onerror=u.onload=null,clearTimeout(a);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chu nk "+e+" failed.")),t[e]=void 0)}return u.onerror=u.onload=i,c.appendChild(u),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="",o.oe=function(e){throw console.error(e),e}}([]); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/knox/blob/cf768a74/gateway-applications/src/main/resources/applications/admin-ui/app/inline.b4085b145a2e0a0b720b.bundle.js ---------------------------------------------------------------------- diff --git a/gateway-applications/src/main/resources/applications/admin-ui/app/inline.b4085b145a2e0a0b720b.bundle.js b/gateway-applications/src/main/resources/applications/admin-ui/app/inline.b4085b145a2e0a0b720b.bundle.js deleted file mode 100644 index b12f62e..0000000 --- a/gateway-applications/src/main/resources/applications/admin-ui/app/inline.b4085b145a2e0a0b720b.bundle.js +++ /dev/null @@ -1 +0,0 @@ -!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,u){for(var a,i,f,l=0,s=[];l<r.length;l++)t[i=r[l]]&&s.push(t[i][0]),t[i]=0;for(a in c)Object.prototype.hasOwnProperty.call(c,a)&&(e[a]=c[a]);for(n&&n(r,c,u);s.length;)s.shift()();if(u)for(l=0;l<u.length;l++)f=o(o.s=u[l]);return f};var r={},t={2:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],u=document.createElement("script");u.type="text/javascript",u.charset="utf-8",u.async=!0,u.timeout=12e4,o.nc&&u.setAttribute("nonce",o.nc),u.src=o.p+""+e+"."+{0:"968fcdd54b9465154f6c",1:"aed76669724804835353"}[e]+".chunk.js";var a=setTimeout(i,12e4);function i(){u.onerror=u.onload=null,clearTimeout(a);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chu nk "+e+" failed.")),t[e]=void 0)}return u.onerror=u.onload=i,c.appendChild(u),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="",o.oe=function(e){throw console.error(e),e}}([]); \ No newline at end of file
