Merge pull request #138 from digitalocean/deprecate/tag-rename
Deprecate tag rename (PUT /v2/tags/:name)
This commit is contained in:
commit
4c04abe183
27
tags.go
27
tags.go
|
@ -14,7 +14,6 @@ type TagsService interface {
|
||||||
List(context.Context, *ListOptions) ([]Tag, *Response, error)
|
List(context.Context, *ListOptions) ([]Tag, *Response, error)
|
||||||
Get(context.Context, string) (*Tag, *Response, error)
|
Get(context.Context, string) (*Tag, *Response, error)
|
||||||
Create(context.Context, *TagCreateRequest) (*Tag, *Response, error)
|
Create(context.Context, *TagCreateRequest) (*Tag, *Response, error)
|
||||||
Update(context.Context, string, *TagUpdateRequest) (*Response, error)
|
|
||||||
Delete(context.Context, string) (*Response, error)
|
Delete(context.Context, string) (*Response, error)
|
||||||
|
|
||||||
TagResources(context.Context, string, *TagResourcesRequest) (*Response, error)
|
TagResources(context.Context, string, *TagResourcesRequest) (*Response, error)
|
||||||
|
@ -65,11 +64,6 @@ type TagCreateRequest struct {
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
}
|
}
|
||||||
|
|
||||||
//TagUpdateRequest represents the JSON structure of a request of that type.
|
|
||||||
type TagUpdateRequest struct {
|
|
||||||
Name string `json:"name"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// TagResourcesRequest represents the JSON structure of a request of that type.
|
// TagResourcesRequest represents the JSON structure of a request of that type.
|
||||||
type TagResourcesRequest struct {
|
type TagResourcesRequest struct {
|
||||||
Resources []Resource `json:"resources"`
|
Resources []Resource `json:"resources"`
|
||||||
|
@ -153,27 +147,6 @@ func (s *TagsServiceOp) Create(ctx context.Context, createRequest *TagCreateRequ
|
||||||
return root.Tag, resp, err
|
return root.Tag, resp, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update an exsting tag
|
|
||||||
func (s *TagsServiceOp) Update(ctx context.Context, name string, updateRequest *TagUpdateRequest) (*Response, error) {
|
|
||||||
if name == "" {
|
|
||||||
return nil, NewArgError("name", "cannot be empty")
|
|
||||||
}
|
|
||||||
|
|
||||||
if updateRequest == nil {
|
|
||||||
return nil, NewArgError("updateRequest", "cannot be nil")
|
|
||||||
}
|
|
||||||
|
|
||||||
path := fmt.Sprintf("%s/%s", tagsBasePath, name)
|
|
||||||
req, err := s.client.NewRequest(ctx, "PUT", path, updateRequest)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
resp, err := s.client.Do(req, nil)
|
|
||||||
|
|
||||||
return resp, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// Delete an existing tag
|
// Delete an existing tag
|
||||||
func (s *TagsServiceOp) Delete(ctx context.Context, name string) (*Response, error) {
|
func (s *TagsServiceOp) Delete(ctx context.Context, name string) (*Response, error) {
|
||||||
if name == "" {
|
if name == "" {
|
||||||
|
|
31
tags_test.go
31
tags_test.go
|
@ -42,7 +42,7 @@ var (
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"links": {
|
"links": {
|
||||||
"pages":{
|
"pages":{
|
||||||
"next":"http://example.com/v2/tags/?page=3",
|
"next":"http://example.com/v2/tags/?page=3",
|
||||||
"prev":"http://example.com/v2/tags/?page=1",
|
"prev":"http://example.com/v2/tags/?page=1",
|
||||||
"last":"http://example.com/v2/tags/?page=3",
|
"last":"http://example.com/v2/tags/?page=3",
|
||||||
|
@ -282,35 +282,6 @@ func TestTags_Create(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestTags_Update(t *testing.T) {
|
|
||||||
setup()
|
|
||||||
defer teardown()
|
|
||||||
|
|
||||||
updateRequest := &TagUpdateRequest{
|
|
||||||
Name: "testing-1",
|
|
||||||
}
|
|
||||||
|
|
||||||
mux.HandleFunc("/v2/tags/old-testing-1", func(w http.ResponseWriter, r *http.Request) {
|
|
||||||
v := new(TagUpdateRequest)
|
|
||||||
|
|
||||||
err := json.NewDecoder(r.Body).Decode(v)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("decode json: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
testMethod(t, r, "PUT")
|
|
||||||
if !reflect.DeepEqual(v, updateRequest) {
|
|
||||||
t.Errorf("Request body = %+v, expected %+v", v, updateRequest)
|
|
||||||
}
|
|
||||||
|
|
||||||
})
|
|
||||||
|
|
||||||
_, err := client.Tags.Update(ctx, "old-testing-1", updateRequest)
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("Tags.Update returned error: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestTags_Delete(t *testing.T) {
|
func TestTags_Delete(t *testing.T) {
|
||||||
setup()
|
setup()
|
||||||
defer teardown()
|
defer teardown()
|
||||||
|
|
Loading…
Reference in New Issue