[incubator-trafficcontrol] 03/05: default a nil or empty deliveryService RoutingName to "cdn"

[rob]

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

rob pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git

commit 9fff24cff3b330376d47ca370a9c41b377825b8c
Author: Dylan Volz <dylan_v...@comcast.com>
AuthorDate: Thu May 31 20:39:40 2018 -0600

    default a nil or empty deliveryService RoutingName to "cdn"
---
 .../traffic_ops_golang/deliveryservice/deliveryservicesv12.go     | 5 +++++
 .../traffic_ops_golang/deliveryservice/deliveryservicesv13.go     | 5 +++++
 traffic_ops/traffic_ops_golang/utils/ptr.go                       | 8 ++++----
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git 
a/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservicesv12.go 
b/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservicesv12.go
index 9d9c2f0..67eb3ce 100644
--- a/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservicesv12.go
+++ b/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservicesv12.go
@@ -35,6 +35,7 @@ import (
        
"github.com/apache/incubator-trafficcontrol/traffic_ops/traffic_ops_golang/config"
        
"github.com/apache/incubator-trafficcontrol/traffic_ops/traffic_ops_golang/tenant"
        
"github.com/apache/incubator-trafficcontrol/traffic_ops/traffic_ops_golang/tovalidate"
+       
"github.com/apache/incubator-trafficcontrol/traffic_ops/traffic_ops_golang/utils"
 
        "github.com/asaskevich/govalidator"
        "github.com/go-ozzo/ozzo-validation"
@@ -329,6 +330,10 @@ func CreateV12(db *sqlx.DB, cfg config.Config) 
http.HandlerFunc {
                        return
                }
 
+               if ds.RoutingName == nil || *ds.RoutingName == "" {
+                       ds.RoutingName = utils.StrPtr("cdn")
+               }
+
                if errs := validateV12(db, &ds); len(errs) > 0 {
                        api.HandleErr(w, r, http.StatusBadRequest, 
errors.New("invalid request: "+util.JoinErrs(errs).Error()), nil)
                        return
diff --git 
a/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservicesv13.go 
b/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservicesv13.go
index e3957c3..8b1b8b7 100644
--- a/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservicesv13.go
+++ b/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservicesv13.go
@@ -38,6 +38,7 @@ import (
        
"github.com/apache/incubator-trafficcontrol/traffic_ops/traffic_ops_golang/riaksvc"
        
"github.com/apache/incubator-trafficcontrol/traffic_ops/traffic_ops_golang/tenant"
        
"github.com/apache/incubator-trafficcontrol/traffic_ops/traffic_ops_golang/tovalidate"
+       
"github.com/apache/incubator-trafficcontrol/traffic_ops/traffic_ops_golang/utils"
 
        "github.com/go-ozzo/ozzo-validation"
        "github.com/jmoiron/sqlx"
@@ -154,6 +155,10 @@ func CreateV13(db *sqlx.DB, cfg config.Config) 
http.HandlerFunc {
                        return
                }
 
+               if ds.RoutingName == nil || *ds.RoutingName == "" {
+                       ds.RoutingName = utils.StrPtr("cdn")
+               }
+
                if errs := validateV13(db, &ds); len(errs) > 0 {
                        api.HandleErr(w, r, http.StatusBadRequest, 
errors.New("invalid request: "+util.JoinErrs(errs).Error()), nil)
                        return
diff --git a/traffic_ops/traffic_ops_golang/utils/ptr.go 
b/traffic_ops/traffic_ops_golang/utils/ptr.go
index 066a083..dd1940e 100644
--- a/traffic_ops/traffic_ops_golang/utils/ptr.go
+++ b/traffic_ops/traffic_ops_golang/utils/ptr.go
@@ -19,13 +19,13 @@ package utils
  * under the License.
  */
 
- import (
+import (
        "time"
 
        "github.com/apache/incubator-trafficcontrol/lib/go-tc"
- )
+)
 
- func StrPtr(str string) *string {
+func StrPtr(str string) *string {
        return &str
 }
 
@@ -39,4 +39,4 @@ func BoolPtr(b bool) *bool {
 
 func NewTimeNoMod() *tc.TimeNoMod {
        return &tc.TimeNoMod{Time: time.Now()}
-}
\ No newline at end of file
+}

-- 
To stop receiving notification emails like this one, please contact
r...@apache.org.