Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11 from platform9/api-version-urls

Browse Source 
Add API version to URLs
This commit is contained in:
Soam Vasani
2016-09-29 22:33:27 -07:00
committed by GitHub
parent 3177c035c6 012a8de1ec
commit ff3efa3434
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controller/api.go
+15 -15
View File
@@ -78,23 +78,23 @@ func (api *API) serve(port int) {
r := mux.NewRouter() r := mux.NewRouter()
r.HandleFunc("/", api.HomeHandler) r.HandleFunc("/", api.HomeHandler)
r.HandleFunc("/functions", api.FunctionApiList).Methods("GET") r.HandleFunc("/v1/functions", api.FunctionApiList).Methods("GET")
r.HandleFunc("/functions", api.FunctionApiCreate).Methods("POST") r.HandleFunc("/v1/functions", api.FunctionApiCreate).Methods("POST")
r.HandleFunc("/functions/{function}", api.FunctionApiGet).Methods("GET") r.HandleFunc("/v1/functions/{function}", api.FunctionApiGet).Methods("GET")
r.HandleFunc("/functions/{function}", api.FunctionApiUpdate).Methods("PUT") r.HandleFunc("/v1/functions/{function}", api.FunctionApiUpdate).Methods("PUT")
r.HandleFunc("/functions/{function}", api.FunctionApiDelete).Methods("DELETE") r.HandleFunc("/v1/functions/{function}", api.FunctionApiDelete).Methods("DELETE")
r.HandleFunc("/triggers/http", api.HTTPTriggerApiList).Methods("GET") r.HandleFunc("/v1/triggers/http", api.HTTPTriggerApiList).Methods("GET")
r.HandleFunc("/triggers/http", api.HTTPTriggerApiCreate).Methods("POST") r.HandleFunc("/v1/triggers/http", api.HTTPTriggerApiCreate).Methods("POST")
r.HandleFunc("/triggers/http/{httpTrigger}", api.HTTPTriggerApiGet).Methods("GET") r.HandleFunc("/v1/triggers/http/{httpTrigger}", api.HTTPTriggerApiGet).Methods("GET")
r.HandleFunc("/triggers/http/{httpTrigger}", api.HTTPTriggerApiUpdate).Methods("PUT") r.HandleFunc("/v1/triggers/http/{httpTrigger}", api.HTTPTriggerApiUpdate).Methods("PUT")
r.HandleFunc("/triggers/http/{httpTrigger}", api.HTTPTriggerApiDelete).Methods("DELETE") r.HandleFunc("/v1/triggers/http/{httpTrigger}", api.HTTPTriggerApiDelete).Methods("DELETE")
r.HandleFunc("/environments", api.EnvironmentApiList).Methods("GET") r.HandleFunc("/v1/environments", api.EnvironmentApiList).Methods("GET")
r.HandleFunc("/environments", api.EnvironmentApiCreate).Methods("POST") r.HandleFunc("/v1/environments", api.EnvironmentApiCreate).Methods("POST")
r.HandleFunc("/environments/{environment}", api.EnvironmentApiGet).Methods("GET") r.HandleFunc("/v1/environments/{environment}", api.EnvironmentApiGet).Methods("GET")
r.HandleFunc("/environments/{environment}", api.EnvironmentApiUpdate).Methods("PUT") r.HandleFunc("/v1/environments/{environment}", api.EnvironmentApiUpdate).Methods("PUT")
r.HandleFunc("/environments/{environment}", api.EnvironmentApiDelete).Methods("DELETE") r.HandleFunc("/v1/environments/{environment}", api.EnvironmentApiDelete).Methods("DELETE")
address := fmt.Sprintf(":%v", port) address := fmt.Sprintf(":%v", port)
controller/client/client.go
+1 -1
View File
@@ -74,7 +74,7 @@ func (c *Client) put(relativeUrl string, contentType string, body []byte) (*http
} }
func (c *Client) url(relativeUrl string) string { func (c *Client) url(relativeUrl string) string {
return c.Url + "/" + relativeUrl return c.Url + "/v1/" + relativeUrl
} }
func (c *Client) handleResponse(resp *http.Response) ([]byte, error) { func (c *Client) handleResponse(resp *http.Response) ([]byte, error) {