[GitHub] dangogh closed pull request #2431: Changed version on DeliveryServicesResponse to fix TM build

[GitBox <gi...@apache.org>]

dangogh closed pull request #2431: Changed version on DeliveryServicesResponse to fix TM build
URL: https://github.com/apache/trafficcontrol/pull/2431
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/lib/go-tc/deliveryservices.go b/lib/go-tc/deliveryservices.go
index 8b556e945..f63d1a4a5 100644
--- a/lib/go-tc/deliveryservices.go
+++ b/lib/go-tc/deliveryservices.go
@@ -26,12 +26,12 @@ const DefaultRoutingName = "cdn"
 //
 // GetDeliveryServiceResponse is deprecated use DeliveryServicesResponse...
 type GetDeliveryServiceResponse struct {
-	Response []DeliveryServiceV13 `json:"response"`
+	Response []DeliveryService `json:"response"`
 }
 
 // DeliveryServicesResponse ...
 type DeliveryServicesResponse struct {
-	Response []DeliveryService `json:"response"`
+	Response []DeliveryServiceV13 `json:"response"`
 }
 
 // CreateDeliveryServiceResponse ...
diff --git a/traffic_ops/client/v13/deliveryservice.go b/traffic_ops/client/v13/deliveryservice.go
index 3791f6650..93dc29f48 100644
--- a/traffic_ops/client/v13/deliveryservice.go
+++ b/traffic_ops/client/v13/deliveryservice.go
@@ -30,7 +30,7 @@ func (to *Session) DeliveryServices() ([]tc.DeliveryServiceV13, error) {
 }
 
 func (to *Session) GetDeliveryServices() ([]tc.DeliveryServiceV13, ReqInf, error) {
-	var data tc.GetDeliveryServiceResponse
+	var data tc.DeliveryServicesResponse
 	reqInf, err := get(to, deliveryServicesEp(), &data)
 	if err != nil {
 		return nil, reqInf, err
@@ -47,7 +47,7 @@ func (to *Session) DeliveryServicesByServer(id int) ([]tc.DeliveryServiceV13, er
 }
 
 func (to *Session) GetDeliveryServicesByServer(id int) ([]tc.DeliveryServiceV13, ReqInf, error) {
-	var data tc.GetDeliveryServiceResponse
+	var data tc.DeliveryServicesResponse
 	reqInf, err := get(to, deliveryServicesByServerEp(strconv.Itoa(id)), &data)
 	if err != nil {
 		return nil, reqInf, err
@@ -64,7 +64,7 @@ func (to *Session) DeliveryService(id string) (*tc.DeliveryServiceV13, error) {
 }
 
 func (to *Session) GetDeliveryService(id string) (*tc.DeliveryServiceV13, ReqInf, error) {
-	var data tc.GetDeliveryServiceResponse
+	var data tc.DeliveryServicesResponse
 	reqInf, err := get(to, deliveryServiceEp(id), &data)
 	if err != nil {
 		return nil, reqInf, err


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services