Merge pull request #2764 from spadgett/edit-hostname

Automatic merge from submit-queue.

Bug 1540783 - Keep hostname updates in route editor

Author: openshift-merge-robot

app/scripts/controllers/edit/route.js

@@ -51,6 +51,7 @@ angular.module('openshiftConsole')
     var routesVersion = APIService.getPreferredVersion('routes');
     var servicesVersion = APIService.getPreferredVersion('services');
 
+    var host;
 
     ProjectsService
       .get($routeParams.project)
@@ -77,7 +78,7 @@ angular.module('openshiftConsole')
             }
 
             route = angular.copy(original);
-            var host = _.get(route, 'spec.host');
+            host = _.get(route, 'spec.host');
             var isWildcard = _.get(route, 'spec.wildcardPolicy') === 'Subdomain';
             if (isWildcard) {
               // Display the route as a wildcard.
@@ -126,6 +127,13 @@ angular.module('openshiftConsole')
             _.set(updated, 'spec.to.weight', weight);
           }
 
+          var updatedHost = $scope.routing.host;
+          if (host !== updatedHost) {
+            if (updatedHost.startsWith('*.')) {
+              updatedHost = 'wildcard' + updatedHost.substring(1);
+            }
+            updated.spec.host = updatedHost;
+          }
           updated.spec.path = $scope.routing.path;
 
           var targetPort = $scope.routing.targetPort;

app/scripts/directives/oscRouting.js

@@ -71,7 +71,10 @@ angular.module("openshiftConsole")
           return !canISetCustomHost();
         };
 
-        scope.disableWildcards = Constants.DISABLE_WILDCARD_ROUTES;
+        // Wildcard policy can't be modified for existing routes.
+        scope.disableWildcards =
+          Constants.DISABLE_WILDCARD_ROUTES ||
+          (scope.existingRoute && scope.route.wildcardPolicy !== 'Subdomain');
 
         // Certificate updates also require custom host.
         scope.areCertificateInputsReadOnly = function() {

dist/scripts/scripts.js

@@ -7805,43 +7805,41 @@ var m = function() {
 t.path(r.routeURL);
 };
 r.cancel = m;
-var p = a.getPreferredVersion("routes"), f = a.getPreferredVersion("services");
+var p, f = a.getPreferredVersion("routes"), g = a.getPreferredVersion("services");
 l.get(n.project).then(_.spread(function(t, a) {
 if (r.project = t, o.canI("routes", "update", n.project)) {
-var l, g = e("orderByDisplayName"), v = function() {
+var l, v = e("orderByDisplayName"), h = function() {
 s.toErrorPage('Editing routes with non-service targets is unsupported. You can edit the route with the "Edit YAML" action instead.');
 };
-i.get(p, r.routeName, a).then(function(e) {
-if ("Service" === e.spec.to.kind) {
-l = angular.copy(e);
-var t = _.get(l, "spec.host");
-"Subdomain" === _.get(l, "spec.wildcardPolicy") && (t = "*." + u.getSubdomain(l)), r.routing = {
-host: t,
+i.get(f, r.routeName, a).then(function(e) {
+"Service" === e.spec.to.kind ? (l = angular.copy(e), p = _.get(l, "spec.host"), "Subdomain" === _.get(l, "spec.wildcardPolicy") && (p = "*." + u.getSubdomain(l)), r.routing = {
+host: p,
 wildcardPolicy: _.get(l, "spec.wildcardPolicy"),
 path: _.get(l, "spec.path"),
 targetPort: _.get(l, "spec.port.targetPort"),
 tls: angular.copy(_.get(l, "spec.tls"))
-}, i.list(f, a).then(function(e) {
+}, i.list(g, a).then(function(e) {
 r.loading = !1;
 var t = e.by("metadata.name");
 r.routing.to = l.spec.to, r.routing.alternateServices = [], _.each(_.get(l, "spec.alternateBackends"), function(e) {
-if ("Service" !== e.kind) return v(), !1;
+if ("Service" !== e.kind) return h(), !1;
 r.routing.alternateServices.push(e);
-}), r.services = g(t);
-});
-} else v();
+}), r.services = v(t);
+})) : h();
 }, function() {
 s.toErrorPage("Could not load route " + r.routeName + ".");
 });
-var h = function() {
+var y = function() {
 var e = angular.copy(l), t = _.get(r, "routing.to.name");
 _.set(e, "spec.to.name", t);
 var n = _.get(r, "routing.to.weight");
-isNaN(n) || _.set(e, "spec.to.weight", n), e.spec.path = r.routing.path;
-var a = r.routing.targetPort;
-a ? _.set(e, "spec.port.targetPort", a) : delete e.spec.port, _.get(r, "routing.tls.termination") ? (e.spec.tls = r.routing.tls, "passthrough" === e.spec.tls.termination && (delete e.spec.path, delete e.spec.tls.certificate, delete e.spec.tls.key, delete e.spec.tls.caCertificate), "reencrypt" !== e.spec.tls.termination && delete e.spec.tls.destinationCACertificate) : delete e.spec.tls;
-var o = _.get(r, "routing.alternateServices", []);
-return _.isEmpty(o) ? delete e.spec.alternateBackends : e.spec.alternateBackends = _.map(o, function(e) {
+isNaN(n) || _.set(e, "spec.to.weight", n);
+var a = r.routing.host;
+p !== a && (a.startsWith("*.") && (a = "wildcard" + a.substring(1)), e.spec.host = a), e.spec.path = r.routing.path;
+var o = r.routing.targetPort;
+o ? _.set(e, "spec.port.targetPort", o) : delete e.spec.port, _.get(r, "routing.tls.termination") ? (e.spec.tls = r.routing.tls, "passthrough" === e.spec.tls.termination && (delete e.spec.path, delete e.spec.tls.certificate, delete e.spec.tls.key, delete e.spec.tls.caCertificate), "reencrypt" !== e.spec.tls.termination && delete e.spec.tls.destinationCACertificate) : delete e.spec.tls;
+var i = _.get(r, "routing.alternateServices", []);
+return _.isEmpty(i) ? delete e.spec.alternateBackends : e.spec.alternateBackends = _.map(i, function(e) {
 return {
 kind: "Service",
 name: e.name,
@@ -7852,8 +7850,8 @@ weight: e.weight
 r.updateRoute = function() {
 if (r.form.$valid) {
 d(), r.disableInputs = !0;
-var t = h();
-i.update(p, r.routeName, t, a).then(function() {
+var t = y();
+i.update(f, r.routeName, t, a).then(function() {
 c.addNotification({
 type: "success",
 message: "Route " + r.routeName + " was successfully updated."
@@ -10046,7 +10044,7 @@ return r.existingRoute ? r.canIUpdateCustomHosts : r.canICreateCustomHosts;
 };
 r.isHostnameReadOnly = function() {
 return !c();
-}, r.disableWildcards = t.DISABLE_WILDCARD_ROUTES, r.areCertificateInputsReadOnly = function() {
+}, r.disableWildcards = t.DISABLE_WILDCARD_ROUTES || r.existingRoute && "Subdomain" !== r.route.wildcardPolicy, r.areCertificateInputsReadOnly = function() {
 return !r.canICreateCustomHosts;
 }, r.areCertificateInputsDisabled = function() {
 var e = _.get(r, "route.tls.termination");