Skip to content

Use non-deprecated namespace URLs #247

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
Nov 2, 2020
Merged

Use non-deprecated namespace URLs #247

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
11 changes: 5 additions & 6 deletions pkg/m3admin/namespace/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,9 @@ import (
)

const (
namespaceLegacyBaseURL = "/api/v1/namespace"
namespaceBaseURL = "/api/v1/services/m3db/namespace"
namespaceDeleteFmt = namespaceLegacyBaseURL + "/%s"
namespaceReadyURL = namespaceBaseURL + "/ready"
namespaceBaseURL = "/api/v1/services/m3db/namespace"
namespaceDeleteFmt = namespaceBaseURL + "/%s"
namespaceReadyURL = namespaceBaseURL + "/ready"
)

type namespaceClient struct {
Expand Down Expand Up @@ -102,7 +101,7 @@ func NewClient(opts ...Option) (Client, error) {

// Create will create a namespace
func (n *namespaceClient) Create(req *admin.NamespaceAddRequest) error {
url := n.url + namespaceLegacyBaseURL
url := n.url + namespaceBaseURL
err := n.client.DoHTTPJSONPBRequest(http.MethodPost, url, req, nil)
if err != nil {
return err
Expand All @@ -114,7 +113,7 @@ func (n *namespaceClient) Create(req *admin.NamespaceAddRequest) error {
// List will retrieve all namespaces
func (n *namespaceClient) List() (*admin.NamespaceGetResponse, error) {
var (
url = n.url + namespaceLegacyBaseURL
url = n.url + namespaceBaseURL
resp = &admin.NamespaceGetResponse{}
)
err := n.client.DoHTTPJSONPBRequest(http.MethodGet, url, nil, resp)
Expand Down
2 changes: 1 addition & 1 deletion pkg/m3admin/namespace/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ func TestGetErr(t *testing.T) {

func TestDelete(t *testing.T) {
s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if r.URL.String() != "/api/v1/namespace/default" || r.Method != "DELETE" {
if r.URL.String() != "/api/v1/services/m3db/namespace/default" || r.Method != "DELETE" {
w.WriteHeader(404)
return
}
Expand Down