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

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


The following commit(s) were added to refs/heads/master by this push:
     new 2957e52  Minor routes.go cleanup (#3736)
2957e52 is described below

commit 2957e5238e2bd75e9a9f85b9246622f38ff3d88f
Author: Rawlin Peters <[email protected]>
AuthorDate: Thu Jul 18 07:49:42 2019 -0600

    Minor routes.go cleanup (#3736)
    
    Remove some duplicate routes and unnecessary comments.
---
 traffic_ops/traffic_ops_golang/routing/routes.go | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/traffic_ops/traffic_ops_golang/routing/routes.go 
b/traffic_ops/traffic_ops_golang/routing/routes.go
index b7e4cc8..3734340 100644
--- a/traffic_ops/traffic_ops_golang/routing/routes.go
+++ b/traffic_ops/traffic_ops_golang/routing/routes.go
@@ -164,7 +164,6 @@ func Routes(d ServerData) ([]Route, []RawRoute, 
http.Handler, error) {
                {1.1, http.MethodPost, `user/login/?$`, 
login.LoginHandler(d.DB, d.Config), 0, NoAuth, nil},
 
                //User: CRUD
-               //Incrementing version for users because change to Nullable 
struct.
                {1.1, http.MethodGet, `users/?(\.json)?$`, 
api.ReadHandler(&user.TOUser{}), auth.PrivLevelReadOnly, Authenticated, nil},
                {1.1, http.MethodGet, `users/{id}$`, 
api.ReadHandler(&user.TOUser{}), auth.PrivLevelReadOnly, Authenticated, nil},
                {1.1, http.MethodPut, `users/{id}$`, 
api.UpdateHandler(&user.TOUser{}), auth.PrivLevelOperations, Authenticated, 
nil},
@@ -219,7 +218,6 @@ func Routes(d ServerData) ([]Route, []RawRoute, 
http.Handler, error) {
                {1.1, http.MethodGet, `servers/{id}/deliveryservices$`, 
api.ReadHandler(&dsserver.TODSSDeliveryService{}), auth.PrivLevelReadOnly, 
Authenticated, nil},
                {1.1, http.MethodGet, `deliveryservices/{id}/servers$`, 
dsserver.GetReadAssigned, auth.PrivLevelReadOnly, Authenticated, nil},
                {1.1, http.MethodGet, 
`deliveryservices/{id}/unassigned_servers$`, dsserver.GetReadUnassigned, 
auth.PrivLevelReadOnly, Authenticated, nil},
-               //{1.1, http.MethodGet, 
`deliveryservices/{id}/servers/eligible$`, dsserver.GetReadHandler(d.Tx, 
tc.Eligible),auth.PrivLevelReadOnly, Authenticated, nil},
 
                {1.1, http.MethodGet, `deliveryservice_matches/?(\.json)?$`, 
deliveryservice.GetMatches, auth.PrivLevelReadOnly, Authenticated, nil},
 
@@ -229,8 +227,8 @@ func Routes(d ServerData) ([]Route, []RawRoute, 
http.Handler, error) {
                {1.1, http.MethodGet, `servers/totals$`, 
handlerToFunc(proxyHandler), 0, NoAuth, []Middleware{}},
 
                //Server Details
-               {1.2, http.MethodGet, `servers/details/?(\.json)?$`, 
server.GetDetailParamHandler, auth.PrivLevelReadOnly, Authenticated, nil},
-               {1.2, http.MethodGet, 
`servers/hostname/{hostName}/details/?(\.json)?$`, server.GetDetailHandler, 
auth.PrivLevelReadOnly, Authenticated, nil},
+               {1.1, http.MethodGet, `servers/details/?(\.json)?$`, 
server.GetDetailParamHandler, auth.PrivLevelReadOnly, Authenticated, nil},
+               {1.1, http.MethodGet, 
`servers/hostname/{hostName}/details/?(\.json)?$`, server.GetDetailHandler, 
auth.PrivLevelReadOnly, Authenticated, nil},
 
                //Server: CRUD
                {1.1, http.MethodGet, `servers/?(\.json)?$`, 
api.ReadHandler(&server.TOServer{}), auth.PrivLevelReadOnly, Authenticated, 
nil},
@@ -266,13 +264,6 @@ func Routes(d ServerData) ([]Route, []RawRoute, 
http.Handler, error) {
                {1.3, http.MethodPost, `coordinates/?$`, 
api.CreateHandler(&coordinate.TOCoordinate{}), auth.PrivLevelOperations, 
Authenticated, nil},
                {1.3, http.MethodDelete, `coordinates/?$`, 
api.DeleteHandler(&coordinate.TOCoordinate{}), auth.PrivLevelOperations, 
Authenticated, nil},
 
-               //Servers
-               // explicitly passed to legacy system until fully implemented.  
Auth handled by legacy system.
-               {1.2, http.MethodGet, `servers/checks$`, 
handlerToFunc(proxyHandler), 0, NoAuth, []Middleware{}},
-               {1.2, http.MethodGet, `servers/details$`, 
handlerToFunc(proxyHandler), 0, NoAuth, []Middleware{}},
-               {1.2, http.MethodGet, `servers/status$`, 
handlerToFunc(proxyHandler), 0, NoAuth, []Middleware{}},
-               {1.2, http.MethodGet, `servers/totals$`, 
handlerToFunc(proxyHandler), 0, NoAuth, []Middleware{}},
-
                //ASNs
                {1.3, http.MethodGet, `asns/?(\.json)?$`, 
api.ReadHandler(&asn.TOASNV11{}), auth.PrivLevelReadOnly, Authenticated, nil},
                {1.3, http.MethodPut, `asns/?$`, 
api.UpdateHandler(&asn.TOASNV11{}), auth.PrivLevelOperations, Authenticated, 
nil},

Reply via email to