Skip to content

bugfix: restful api url should support both with or without version info #1035

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 3, 2018
Merged

bugfix: restful api url should support both with or without version info #1035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions apis/server/router.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ func initRoute(s *Server) http.Handler {

// metrics
r.Path(versionMatcher + "/metrics").Methods(http.MethodGet).Handler(prometheus.Handler())
r.Path("/metrics").Methods(http.MethodGet).Handler(prometheus.Handler())

if s.Config.Debug {
profilerSetup(r)
Expand All @@ -83,6 +84,7 @@ func initRoute(s *Server) http.Handler {

func addRoute(r *mux.Router, mothod string, path string, f func(ctx context.Context, rw http.ResponseWriter, req *http.Request) error) {
r.Path(versionMatcher + path).Methods(mothod).Handler(filter(f))
r.Path(path).Methods(mothod).Handler(filter(f))
}

func profilerSetup(mainRouter *mux.Router) {
Expand Down
3 changes: 2 additions & 1 deletion test/api_version_parameter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ func (suite *APIVersionSuite) SetUpTest(c *check.C) {
}

// TestNoVersionParamsInURL test api url not contains version info.
// Pouch api url support with or without version info.
func (suite *APIVersionSuite) TestNoVersionParamsInURL(c *check.C) {
cname := "TestCreateURLNoVersionInfo"

Expand Down Expand Up @@ -55,5 +56,5 @@ func (suite *APIVersionSuite) TestNoVersionParamsInURL(c *check.C) {
resp, err := apiClient.HTTPCli.Do(req)
c.Assert(err, check.IsNil)

CheckRespStatus(c, resp, 404)
CheckRespStatus(c, resp, 201)
Copy link
Collaborator

@allencloud allencloud Apr 3, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is already an API integration test for the target.

}