bump(github.com/openshift/origin-web-console): 9673fad07166ed5e958b9024848bcb3359069e5c

Author: OpenShift Bot

pkg/assets/bindata.go

@@ -4316,24 +4316,30 @@ message: null
 };
 }), angular.module("openshiftConsole").factory("SecretsService", function() {
 var e = function(e) {
-var t = {}, n = JSON.parse(window.atob(e));
+var t = {
+auths: {}
+}, n = JSON.parse(window.atob(e));
 return _.each(n, function(e, n) {
-t[n] = {
+t.auths[n] = {
 username: e.username,
 password: e.password,
 email: e.email
 };
 }), t;
 }, t = function(e) {
-var t = {}, n = JSON.parse(window.atob(e));
+var t = {
+auths: {}
+}, n = JSON.parse(window.atob(e));
 return _.each(n.auths, function(e, n) {
+if (e.auth) {
 var a = window.atob(e.auth).split(":");
-t[n] = {
+t.auths[n] = {
 username: a[0],
 password: a[1],
 email: e.email
 };
-}), t;
+} else t.auths[n] = e;
+}), n.credsStore && (t.credsStore = n.credsStore), t;
 };
 return {
 groupSecretsByType: function(e) {
@@ -8660,7 +8666,7 @@ title: "Edit YAML"
 var p = function() {
 e.modified = !1, a.returnURL ? n.url(a.returnURL) : r.history.back();
 };
-e.$watch("resource", function(t, n) {
+e.$watch("updated.resource", function(t, n) {
 t !== n && (e.modified = !0);
 });
 var f = [];
@@ -11871,6 +11877,10 @@ d = _.toArray(e.by("metadata.name")), p();
 };
 m.$onInit = function() {
 m.addType = "env", m.disableInputs = !1, f();
+var e = new RegExp("^[A-Za-z_]{1}[A-Za-z0-9_]*$");
+m.hasInvalidEnvVars = _.some(m.secret.data, function(t, n) {
+return !e.test(n);
+});
 }, m.$postLink = function() {
 t.$watch(function() {
 return m.application;
@@ -13915,14 +13925,14 @@ templateUrl: "views/directives/process-template.html"
 angular.module("openshiftConsole").component("processTemplateDialog", {
 controller: [ "$scope", "$filter", "Catalog", "DataService", "KeywordService", "NotificationsService", "ProjectsService", "RecentlyViewedProjectsService", function(e, t, n, a, r, o, i, s) {
 function c() {
-var e = _.get(y, "template.metadata.annotations.iconClass", "fa fa-clone");
+var e = _.get(v, "template.metadata.annotations.iconClass", "fa fa-clone");
 return -1 !== e.indexOf("icon-") ? "font-icon " + e : e;
 }
 function l() {
-y.steps || (y.steps = [ y.selectStep, y.configStep, y.resultsStep ]);
+v.steps || (v.steps = [ v.selectStep, v.configStep, v.resultsStep ]);
 }
 function u() {
-v && (v(), v = void 0);
+h && (h(), h = void 0);
 }
 function d() {
 e.$broadcast("instantiateTemplate");
@@ -13931,67 +13941,64 @@ function m(e, t) {
 return r.filterForKeywords(t, [ "name", "tags" ], r.generateKeywords(e));
 }
 function p(e) {
-y.filterConfig.appliedFilters = e, f();
+v.filterConfig.appliedFilters = e, f();
 }
 function f() {
-y.filteredItems = y.catalogItems, y.filterConfig.appliedFilters && y.filterConfig.appliedFilters.length > 0 && _.each(y.filterConfig.appliedFilters, function(e) {
-y.filteredItems = m(e.value, y.filteredItems);
-}), _.includes(y.filteredItems, y.selectedTemplate) || y.templateSelected(), g();
+v.filteredItems = v.catalogItems, v.filterConfig.appliedFilters && v.filterConfig.appliedFilters.length > 0 && _.each(v.filterConfig.appliedFilters, function(e) {
+v.filteredItems = m(e.value, v.filteredItems);
+}), v.filterConfig.resultsCount = v.filteredItems.length, _.includes(v.filteredItems, v.selectedTemplate) || v.templateSelected();
 }
 function g() {
-y.filterConfig.resultsCount = y.filteredItems.length, y.totalCount <= 1 ? $(".filter-pf.filter-fields input").attr("disabled", "") : $(".filter-pf.filter-fields input").removeAttr("disabled");
-}
-function h() {
-y.unfilteredProjects || i.list().then(function(e) {
-y.unfilteredProjects = _.toArray(e.by("metadata.name"));
+v.unfilteredProjects || i.list().then(function(e) {
+v.unfilteredProjects = _.toArray(e.by("metadata.name"));
 }, function() {
-y.unfilteredProjects = [];
+v.unfilteredProjects = [];
 }).finally(function() {
-b();
+y();
 });
 }
-var v, y = this;
-y.selectStep = {
+var h, v = this;
+v.selectStep = {
 id: "projectTemplates",
 label: "Selection",
 view: "views/directives/process-template-dialog/process-template-select.html",
-hidden: !0 !== y.useProjectTemplate,
+hidden: !0 !== v.useProjectTemplate,
 allowed: !0,
 valid: !1,
 onShow: function() {
-y.selectStep.selected = !0, y.configStep.selected = !1, y.resultsStep.selected = !1, y.nextTitle = "Next >", u(), h();
+v.selectStep.selected = !0, v.configStep.selected = !1, v.resultsStep.selected = !1, v.nextTitle = "Next >", u(), g();
 }
-}, y.configStep = {
+}, v.configStep = {
 id: "configuration",
 label: "Configuration",
 view: "views/directives/process-template-dialog/process-template-config.html",
 valid: !1,
 allowed: !0,
 onShow: function() {
-y.selectStep.selected = !1, y.configStep.selected = !0, y.resultsStep.selected = !1, y.nextTitle = "Create", y.resultsStep.allowed = y.configStep.valid, v = e.$watch("$ctrl.form.$valid", function(e) {
-y.configStep.valid = e && y.selectedProject, y.resultsStep.allowed = e;
+v.selectStep.selected = !1, v.configStep.selected = !0, v.resultsStep.selected = !1, v.nextTitle = "Create", v.resultsStep.allowed = v.configStep.valid, h = e.$watch("$ctrl.form.$valid", function(e) {
+v.configStep.valid = e && v.selectedProject, v.resultsStep.allowed = e;
 });
 }
-}, y.resultsStep = {
+}, v.resultsStep = {
 id: "results",
 label: "Results",
 view: "views/directives/process-template-dialog/process-template-results.html",
 valid: !0,
 allowed: !1,
 prevEnabled: !1,
 onShow: function() {
-y.selectStep.selected = !1, y.configStep.selected = !1, y.resultsStep.selected = !0, y.nextTitle = "Close", u(), y.wizardDone = !0;
+v.selectStep.selected = !1, v.configStep.selected = !1, v.resultsStep.selected = !0, v.nextTitle = "Close", u(), v.wizardDone = !0;
 }
-}, y.$onInit = function() {
-y.loginBaseUrl = a.openshiftAPIBaseUrl(), y.preSelectedProject = y.selectedProject = y.project, h(), y.projectEmptyState = {
+}, v.$onInit = function() {
+v.loginBaseUrl = a.openshiftAPIBaseUrl(), v.preSelectedProject = v.selectedProject = v.project, g(), v.projectEmptyState = {
 icon: "pficon pficon-info",
 title: "No Project Selected",
 info: "Please select a project from the dropdown to load Templates from that project."
-}, y.templatesEmptyState = {
+}, v.templatesEmptyState = {
 icon: "pficon pficon-info",
 title: "No Templates",
 info: "The selected project has no templates available to import."
-}, y.filterConfig = {
+}, v.filterConfig = {
 fields: [ {
 id: "keyword",
 title: "Keyword",
@@ -14006,32 +14013,32 @@ resultsCount: 0,
 appliedFilters: [],
 onFilterChange: p
 };
-}, y.$onChanges = function(e) {
-e.template && y.template && (l(), y.iconClass = c()), e.useProjectTemplate && l();
+}, v.$onChanges = function(e) {
+e.template && v.template && (l(), v.iconClass = c()), e.useProjectTemplate && l();
 }, e.$on("templateInstantiated", function(e, t) {
-y.selectedProject = t.project, y.currentStep = y.resultsStep.label;
-}), y.$onDestroy = function() {
+v.selectedProject = t.project, v.currentStep = v.resultsStep.label;
+}), v.$onDestroy = function() {
 u();
-}, y.next = function(e) {
-return e.stepId === y.configStep.id ? (d(), !1) : e.stepId !== y.resultsStep.id || (y.close(), !1);
-}, y.close = function() {
-var e = y.onDialogClosed();
+}, v.next = function(e) {
+return e.stepId === v.configStep.id ? (d(), !1) : e.stepId !== v.resultsStep.id || (v.close(), !1);
+}, v.close = function() {
+var e = v.onDialogClosed();
 _.isFunction(e) && e();
-}, y.onProjectSelected = function(t) {
-y.selectedProject = t, y.configStep.valid = e.$ctrl.form.$valid && y.selectedProject;
-}, y.templateSelected = function(e) {
-y.selectedTemplate = e, y.template = _.get(e, "resource"), y.selectStep.valid = !!e;
-}, y.templateProjectChange = function() {
-y.templateProjectName = _.get(y.templateProject, "metadata.name"), y.catalogItems = {}, y.templateSelected(), n.getProjectCatalogItems(y.templateProjectName, !1, !0).then(_.spread(function(e, t) {
-y.catalogItems = e, y.totalCount = y.catalogItems.length, f(), t && o.addNotification({
+}, v.onProjectSelected = function(t) {
+v.selectedProject = t, v.configStep.valid = e.$ctrl.form.$valid && v.selectedProject;
+}, v.templateSelected = function(e) {
+v.selectedTemplate = e, v.template = _.get(e, "resource"), v.selectStep.valid = !!e;
+}, v.templateProjectChange = function() {
+v.templateProjectName = _.get(v.templateProject, "metadata.name"), v.catalogItems = {}, v.templateSelected(), n.getProjectCatalogItems(v.templateProjectName, !1, !0).then(_.spread(function(e, t) {
+v.catalogItems = e, v.totalCount = v.catalogItems.length, p(), t && o.addNotification({
 type: "error",
 message: t
 });
 }));
 };
-var b = function() {
-var e = _.reject(y.unfilteredProjects, "metadata.deletionTimestamp"), n = _.sortBy(e, t("displayName"));
-y.searchEnabled = !_.isEmpty(e), y.templateProjects = s.orderByMostRecentlyViewed(n);
+var y = function() {
+var e = _.reject(v.unfilteredProjects, "metadata.deletionTimestamp"), n = _.sortBy(e, t("displayName"));
+v.searchEnabled = !_.isEmpty(e), v.templateProjects = s.orderByMostRecentlyViewed(n);
 };
 } ],
 controllerAs: "$ctrl",
@@ -16869,17 +16876,29 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
 
 
   $templateCache.put('views/_config-file-params.html',
-    "<div ng-repeat=\"(serverName, data) in secretData\" class=\"image-source-item\">\n" +
+    "<div ng-repeat=\"(serverName, data) in secretData.auths\" class=\"image-source-item\">\n" +
     "<h3>{{serverName}}</h3>\n" +
-    "<dt>username</dt>\n" +
-    "<dd class=\"word-break\">{{data.username}}</dd>\n" +
-    "<dt>password</dt>\n" +
-    "<dd ng-if=\"view.showSecret\">\n" +
+    "<dt ng-if-start=\"data.username\">username</dt>\n" +
+    "<dd ng-if-end class=\"word-break\">{{data.username}}</dd>\n" +
+    "<dt ng-if-start=\"data.password\">password</dt>\n" +
+    "<dd ng-if-end>\n" +
+    "<span ng-if=\"view.showSecret\">\n" +
     "<copy-to-clipboard clipboard-text=\"data.password\" display-wide=\"true\"></copy-to-clipboard>\n" +
+    "</span>\n" +
+    "<span ng-if=\"!view.showSecret\">*****</span>\n" +
     "</dd>\n" +
-    "<dd ng-if=\"!view.showSecret\">*****</dd>\n" +
-    "<dt>email</dt>\n" +
-    "<dd class=\"word-break\">{{data.email}}</dd>\n" +
+    "<dt ng-if-start=\"data.email\">email</dt>\n" +
+    "<dd ng-if-end class=\"word-break\">{{data.email}}</dd>\n" +
+    "<div ng-if=\"!data.username && !data.password && !data.email\">\n" +
+    "No username and password.\n" +
+    "</div>\n" +
+    "</div>\n" +
+    "<h3 ng-if-start=\"secretData.credsStore\">Credentials Store</h3>\n" +
+    "<div ng-if-end>\n" +
+    "<span ng-if=\"view.showSecret\">\n" +
+    "<copy-to-clipboard clipboard-text=\"secretData.credsStore\" display-wide=\"true\"></copy-to-clipboard>\n" +
+    "</span>\n" +
+    "<span ng-if=\"!view.showSecret\">*****</span>\n" +
     "</div>"
   );
 
@@ -22313,18 +22332,24 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "<legend>Add secret as:</legend>\n" +
     "<div class=\"form-group\">\n" +
     "<div class=\"radio\">\n" +
-    "<label class=\"add-choice\" for=\"envFrom\">\n" +
-    "<input id=\"envFrom\" type=\"radio\" ng-model=\"ctrl.addType\" value=\"env\" ng-disabled=\"ctrl.disableInputs\">\n" +
+    "<div class=\"add-choice\">\n" +
+    "<label>\n" +
+    "<input type=\"radio\" ng-model=\"ctrl.addType\" value=\"env\" ng-disabled=\"ctrl.disableInputs\">\n" +
     "Environment variables\n" +
     "</label>\n" +
+    "<div class=\"alert alert-warning env-warning\" ng-show=\"ctrl.hasInvalidEnvVars\">\n" +
+    "<span class=\"pficon pficon-warning-triangle-o\" aria-hidden=\"true\"></span>\n" +
+    "<span>Some of the keys for secret <strong>{{ctrl.secret.metadata.name}}</strong> are not valid environment variable names and will not be added.</span>\n" +
+    "</div>\n" +
+    "</div>\n" +
     "<div>\n" +
-    "<label class=\"add-choice\" for=\"mountVolume\">\n" +
-    "<input type=\"radio\" ng-model=\"ctrl.addType\" value=\"volume\" ng-disabled=\"ctrl.disableInputs\">\n" +
+    "<label class=\"add-choice\" for=\"volume\">\n" +
+    "<input id=\"volume\" type=\"radio\" ng-model=\"ctrl.addType\" value=\"volume\" ng-disabled=\"ctrl.disableInputs\">\n" +
     "Volume\n" +
     "</label>\n" +
     "</div>\n" +
     "<div class=\"volume-options\">\n" +
-    "<div ng-class=\"{'has-error': (addToApplicationForm.mountVolume.$error.pattern && addToApplicationForm.mountVolume.$touched)}\">\n" +
+    "<div ng-class=\"{'has-error': (addToApplicationForm.mountVolume.$error.oscUnique || (addToApplicationForm.mountVolume.$error.pattern && addToApplicationForm.mountVolume.$touched))}\">\n" +
     "<input class=\"form-control\" name=\"mountVolume\" id=\"mountVolume\" placeholder=\"Enter a mount path\" type=\"text\" required ng-pattern=\"/^\\/.*$/\" osc-unique=\"ctrl.existingMountPaths\" aria-describedby=\"mount-path-help\" ng-disabled=\"ctrl.addType !== 'volume' || ctrl.disableInputs\" ng-model=\"ctrl.mountVolume\" autocorrect=\"off\" autocapitalize=\"off\" spellcheck=\"false\">\n" +
     "</div>\n" +
     "<div class=\"help-block bind-description\">\n" +
@@ -27326,9 +27351,6 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "<span ng-if=\"kind === 'Deployment'\">\n" +
     "This will delete the deployment, all rollout history, and any running pods.\n" +
     "</span>\n" +
-    "<span ng-if=\"kind === 'BuildConfig'\">\n" +
-    "This will delete the build config and all build history.\n" +
-    "</span>\n" +
     "<span ng-if=\"kind === 'ReplicationController' || kind === 'ReplicaSet' || kind === 'StatefulSet'\">\n" +
     "This will delete the {{typeDisplayName || (kind | humanizeKind)}} and any running pods.\n" +
     "</span>\n" +
@@ -56558,35 +56580,35 @@ function o(t) {
 var n = t.settings()[0]._select.selector;
 e(t.table().container()).off("mousedown.dtSelect", n).off("mouseup.dtSelect", n).off("click.dtSelect", n), e("body").off("click.dtSelect" + t.table().node().id);
 }
-function a(i) {
-var r = e(i.table().container()), o = i.settings()[0], a = o._select.selector;
-r.on("mousedown.dtSelect", a, function(e) {
-(e.shiftKey || e.metaKey || e.ctrlKey) && r.css("-moz-user-select", "none").one("selectstart.dtSelect", a, function() {
+function a(n) {
+var i = e(n.table().container()), r = n.settings()[0], o = r._select.selector;
+i.on("mousedown.dtSelect", o, function(e) {
+(e.shiftKey || e.metaKey || e.ctrlKey) && i.css("-moz-user-select", "none").one("selectstart.dtSelect", o, function() {
 return !1;
 });
-}).on("mouseup.dtSelect", a, function() {
-r.css("-moz-user-select", "");
-}).on("click.dtSelect", a, function(n) {
-var r, o = i.select.items();
+}).on("mouseup.dtSelect", o, function() {
+i.css("-moz-user-select", "");
+}).on("click.dtSelect", o, function(i) {
+var r, o = n.select.items();
 if (!t.getSelection || !e.trim(t.getSelection().toString())) {
-var a = i.settings()[0];
-if (e(n.target).closest("div.dataTables_wrapper")[0] == i.table().container()) {
-var l = i.cell(e(n.target).closest("td, th"));
+var a = n.settings()[0];
+if (e(i.target).closest("div.dataTables_wrapper")[0] == n.table().container()) {
+var l = n.cell(e(i.target).closest("td, th"));
 if (l.any()) {
 var c = e.Event("user-select.dt");
-if (s(i, c, [ o, l, n ]), !c.isDefaultPrevented()) {
+if (s(n, c, [ o, l, i ]), !c.isDefaultPrevented()) {
 var u = l.index();
-"row" === o ? (r = u.row, h(n, i, a, "row", r)) : "column" === o ? (r = l.index().column, h(n, i, a, "column", r)) : "cell" === o && (r = l.index(), h(n, i, a, "cell", r)), a._select_lastCell = u;
+"row" === o ? (r = u.row, h(i, n, a, "row", r)) : "column" === o ? (r = l.index().column, h(i, n, a, "column", r)) : "cell" === o && (r = l.index(), h(i, n, a, "cell", r)), a._select_lastCell = u;
 }
 }
 }
 }
-}), e("body").on("click.dtSelect" + i.table().node().id, function(t) {
-if (o._select.blurable) {
-if (e(t.target).parents().filter(i.table().container()).length) return;
-if (t.target.getRootNode() !== n) return;
+}), e("body").on("click.dtSelect" + n.table().node().id, function(t) {
+if (r._select.blurable) {
+if (e(t.target).parents().filter(n.table().container()).length) return;
+if (0 === e(t.target).parents("html").length) return;
 if (e(t.target).parents("div.DTE").length) return;
-d(o, !0);
+d(r, !0);
 }
 });
 }
@@ -56595,7 +56617,7 @@ r && !t.flatten().length || ("string" == typeof n && (n += ".dt"), i.unshift(t),
 }
 function l(t) {
 var n = t.settings()[0];
-if (n._select.info && n.aanFeatures.i) {
+if (n._select.info && n.aanFeatures.i && "api" !== t.select.style()) {
 var i = t.rows({
 selected: !0
 }).flatten().length, r = t.columns({
@@ -56703,7 +56725,7 @@ var t = e._eventNamespace;
 return "draw.dt.DT" + t + " select.dt.DT" + t + " deselect.dt.DT" + t;
 }
 var g = e.fn.dataTable;
-g.select = {}, g.select.version = "1.2.2", g.select.init = function(t) {
+g.select = {}, g.select.version = "1.2.3", g.select.init = function(t) {
 var n = t.settings()[0], r = n.oInit.select, o = g.defaults.select, a = r === i ? o : r, s = "row", l = "api", c = !1, u = !0, d = "td, th", h = "selected", f = !1;
 n._select = {}, !0 === a ? (l = "os", f = !0) : "string" == typeof a ? (l = a, f = !0) : e.isPlainObject(a) && (a.blurable !== i && (c = a.blurable), a.info !== i && (u = a.info), a.items !== i && (s = a.items), a.style !== i && (l = a.style, f = !0), a.selector !== i && (d = a.selector), a.className !== i && (h = a.className)), t.select.selector(d), t.select.items(s), t.select.style(l), t.select.blurable(c), t.select.info(u), n._select.className = h, e.fn.dataTable.ext.order["select-checkbox"] = function(t, n) {
 return this.api().column(n, {
@@ -308799,10 +308821,10 @@ td.visible-print,th.visible-print{display:table-cell!important}
 .add-secret-to-application .dialog-body .add-choice{margin-bottom:10px}
 .add-secret-to-application .dialog-body .button-group .btn{margin-left:10px}
 .add-secret-to-application .dialog-body .button-group .btn:first-of-type{margin-left:0}
+.add-secret-to-application .env-warning,.add-secret-to-application .volume-options{margin-left:20px}
 .add-secret-to-application .dialog-body legend{border-bottom:0;font-size:14px;font-weight:600;margin-bottom:10px}
 .add-secret-to-application .dialog-body .radio{margin-top:0}
 .add-secret-to-application .updating{background-color:#fff;bottom:55px;left:0;padding-top:60px;position:absolute;right:0;top:55px;z-index:1000}
-.add-secret-to-application .volume-options{margin-left:20px}
 .osc-secrets-form .advanced-secrets .help-blocks,.osc-secrets-form .advanced-secrets .input-labels,.osc-secrets-form .basic-secrets .help-blocks,.osc-secrets-form .basic-secrets .input-labels{display:table;padding-right:30px;position:relative;width:100%}
 .osc-secrets-form .advanced-secrets .help-blocks .help-block,.osc-secrets-form .advanced-secrets .help-blocks .input-label,.osc-secrets-form .advanced-secrets .input-labels .help-block,.osc-secrets-form .advanced-secrets .input-labels .input-label,.osc-secrets-form .basic-secrets .help-blocks .help-block,.osc-secrets-form .basic-secrets .help-blocks .input-label,.osc-secrets-form .basic-secrets .input-labels .help-block,.osc-secrets-form .basic-secrets .input-labels .input-label{width:100%;float:left;padding-right:5px}
 .osc-secrets-form .advanced-secrets .secret-row,.osc-secrets-form .basic-secrets .secret-row{display:table;padding-right:30px;position:relative;width:100%;margin-bottom:15px}