dewrich closed pull request #2106: fixes api tests for ds_requests where route
params were removed in fa…
URL: https://github.com/apache/incubator-trafficcontrol/pull/2106
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/traffic_ops/client/v13/deliveryservice_request_comments.go
b/traffic_ops/client/v13/deliveryservice_request_comments.go
index c168dc4d3..02e0763c9 100644
--- a/traffic_ops/client/v13/deliveryservice_request_comments.go
+++ b/traffic_ops/client/v13/deliveryservice_request_comments.go
@@ -59,7 +59,7 @@ func (to *Session) UpdateDeliveryServiceRequestCommentByID(id
int, comment tc.De
if err != nil {
return tc.Alerts{}, reqInf, err
}
- route := fmt.Sprintf("%s/%d", API_v13_DeliveryServiceRequestComments,
id)
+ route := fmt.Sprintf("%s?id=%d",
API_v13_DeliveryServiceRequestComments, id)
resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody)
if err != nil {
return tc.Alerts{}, reqInf, err
@@ -86,7 +86,7 @@ func (to *Session) GetDeliveryServiceRequestComments()
([]tc.DeliveryServiceRequ
// GET a delivery service request comment by ID
func (to *Session) GetDeliveryServiceRequestCommentByID(id int)
([]tc.DeliveryServiceRequestComment, ReqInf, error) {
- route := fmt.Sprintf("%s/%d", API_v13_DeliveryServiceRequestComments,
id)
+ route := fmt.Sprintf("%s?id=%d",
API_v13_DeliveryServiceRequestComments, id)
resp, remoteAddr, err := to.request(http.MethodGet, route, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr:
remoteAddr}
if err != nil {
@@ -104,7 +104,7 @@ func (to *Session) GetDeliveryServiceRequestCommentByID(id
int) ([]tc.DeliverySe
// DELETE a delivery service request comment by ID
func (to *Session) DeleteDeliveryServiceRequestCommentByID(id int) (tc.Alerts,
ReqInf, error) {
- route := fmt.Sprintf("%s/%d", API_v13_DeliveryServiceRequestComments,
id)
+ route := fmt.Sprintf("%s?id=%d",
API_v13_DeliveryServiceRequestComments, id)
resp, remoteAddr, err := to.request(http.MethodDelete, route, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr:
remoteAddr}
if err != nil {
diff --git a/traffic_ops/client/v13/deliveryservice_requests.go
b/traffic_ops/client/v13/deliveryservice_requests.go
index 2bf3beca4..7b8689ea4 100644
--- a/traffic_ops/client/v13/deliveryservice_requests.go
+++ b/traffic_ops/client/v13/deliveryservice_requests.go
@@ -98,7 +98,7 @@ func (to *Session) GetDeliveryServiceRequestByXMLID(XMLID
string) ([]tc.Delivery
// GET a DeliveryServiceRequest by the DeliveryServiceRequest id
func (to *Session) GetDeliveryServiceRequestByID(id int)
([]tc.DeliveryServiceRequest, ReqInf, error) {
- route := fmt.Sprintf("%s/%d", API_DS_REQUESTS, id)
+ route := fmt.Sprintf("%s?id=%d", API_DS_REQUESTS, id)
resp, remoteAddr, err := to.request(http.MethodGet, route, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr:
remoteAddr}
if err != nil {
@@ -119,7 +119,7 @@ func (to *Session) GetDeliveryServiceRequestByID(id int)
([]tc.DeliveryServiceRe
// Update a DeliveryServiceRequest by ID
func (to *Session) UpdateDeliveryServiceRequestByID(id int, dsr
tc.DeliveryServiceRequest) (tc.Alerts, ReqInf, error) {
- route := fmt.Sprintf("%s/%d", API_DS_REQUESTS, id)
+ route := fmt.Sprintf("%s?id=%d", API_DS_REQUESTS, id)
var remoteAddr net.Addr
reqBody, err := json.Marshal(dsr)
@@ -139,7 +139,7 @@ func (to *Session) UpdateDeliveryServiceRequestByID(id int,
dsr tc.DeliveryServi
// DELETE a DeliveryServiceRequest by DeliveryServiceRequest assignee
func (to *Session) DeleteDeliveryServiceRequestByID(id int) (tc.Alerts,
ReqInf, error) {
- route := fmt.Sprintf("%s/%d", API_DS_REQUESTS, id)
+ route := fmt.Sprintf("%s?id=%d", API_DS_REQUESTS, id)
resp, remoteAddr, err := to.rawRequest(http.MethodDelete, route, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr:
remoteAddr}
if err != nil {
----------------------------------------------------------------
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:
[email protected]
With regards,
Apache Git Services
