Remove the addition of the 4.1 TO API version

docs/source/api/v4/deliveryservices_xmlid_xmlid_sslkeys.rst

@@ -73,7 +73,7 @@ Response Structure
 :expiration:      The expiration date of the certificate for the :term:`Delivery Service` in :rfc:`3339` format
 :sans:            The :abbr:`SANs (Subject Alternate Names)` from the SSL certificate.
 
-	.. versionadded:: 4.1
+	.. versionadded:: 4.0
 
 .. code-block:: http
 	:caption: Response Example

lib/go-tc/deliveryservice_ssl_keys.go

@@ -67,14 +67,14 @@ type DeliveryServiceSSLKeys struct {
 
 // DeliveryServiceSSLKeysV4 is the representation of a DeliveryServiceSSLKeys in the latest minor version of
 // version 4 of the Traffic Ops API.
-type DeliveryServiceSSLKeysV4 = DeliveryServiceSSLKeysV41
+type DeliveryServiceSSLKeysV4 = DeliveryServiceSSLKeysV40
 
 // DeliveryServiceSSLKeysV41 structures contain information about an SSL key
 // certificate pair used by a Delivery Service.
 //
 // "V41" is used because this structure was first introduced in version 4.1 of
 // the Traffic Ops API.
-type DeliveryServiceSSLKeysV41 struct {
+type DeliveryServiceSSLKeysV40 struct {
 	DeliveryServiceSSLKeysV15
 	Sans []string `json:"sans,omitempty"`
 }

traffic_ops/traffic_ops_golang/deliveryservice/keys.go

@@ -166,7 +166,7 @@ func GetSSLKeysByXMLID(w http.ResponseWriter, r *http.Request) {
 	}
 
 	var keyObj interface{}
-	if inf.Version.Major < 4 || (inf.Version.Major == 4 && inf.Version.Minor < 1) {
+	if inf.Version.Major < 4 {
 		keyObj = keyObjV4.DeliveryServiceSSLKeysV15
 	} else {
 		keyObj = keyObjV4

traffic_ops/traffic_ops_golang/routing/routes.go

@@ -130,9 +130,6 @@ func Routes(d ServerData) ([]Route, http.Handler, error) {
 		 * 4.x API
 		 */
 
-		// SSL Keys
-		{api.Version{Major: 4, Minor: 1}, http.MethodGet, `deliveryservices/xmlId/{xmlid}/sslkeys$`, deliveryservice.GetSSLKeysByXMLID, auth.PrivLevelAdmin, nil, Authenticated, nil, 41357729074},
-
 		// CDN lock
 		{api.Version{Major: 4, Minor: 0}, http.MethodGet, `cdn_locks/?$`, cdn_lock.Read, auth.PrivLevelReadOnly, nil, Authenticated, nil, 4134390561},
 		{api.Version{Major: 4, Minor: 0}, http.MethodPost, `cdn_locks/?$`, cdn_lock.Create, auth.PrivLevelOperations, nil, Authenticated, nil, 4134390562},

traffic_portal/app/src/scripts/config.js

@@ -23,4 +23,4 @@
 
 angular.module('config', [])
 
-.constant('ENV', { api: { root:'/api/4.1/', stable: "/api/3.1/" } });
+.constant('ENV', { api: { root:'/api/4.0/', stable: "/api/3.1/" } });