Merge branch 'master' into spaces-registry
This commit is contained in:
@@ -12,7 +12,7 @@ import (
|
||||
"github.com/go-chi/render"
|
||||
"github.com/golang/protobuf/jsonpb"
|
||||
|
||||
"github.com/golang/protobuf/ptypes/empty"
|
||||
ptypesempty "github.com/golang/protobuf/ptypes/empty"
|
||||
)
|
||||
|
||||
type webAccountsServiceHandler struct {
|
||||
@@ -25,9 +25,7 @@ func (h *webAccountsServiceHandler) ServeHTTP(w http.ResponseWriter, r *http.Req
|
||||
}
|
||||
|
||||
func (h *webAccountsServiceHandler) ListAccounts(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
req := &ListAccountsRequest{}
|
||||
|
||||
resp := &ListAccountsResponse{}
|
||||
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
@@ -49,9 +47,7 @@ func (h *webAccountsServiceHandler) ListAccounts(w http.ResponseWriter, r *http.
|
||||
}
|
||||
|
||||
func (h *webAccountsServiceHandler) GetAccount(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
req := &GetAccountRequest{}
|
||||
|
||||
resp := &Account{}
|
||||
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
@@ -73,9 +69,7 @@ func (h *webAccountsServiceHandler) GetAccount(w http.ResponseWriter, r *http.Re
|
||||
}
|
||||
|
||||
func (h *webAccountsServiceHandler) CreateAccount(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
req := &CreateAccountRequest{}
|
||||
|
||||
resp := &Account{}
|
||||
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
@@ -97,9 +91,7 @@ func (h *webAccountsServiceHandler) CreateAccount(w http.ResponseWriter, r *http
|
||||
}
|
||||
|
||||
func (h *webAccountsServiceHandler) UpdateAccount(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
req := &UpdateAccountRequest{}
|
||||
|
||||
resp := &Account{}
|
||||
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
@@ -121,9 +113,8 @@ func (h *webAccountsServiceHandler) UpdateAccount(w http.ResponseWriter, r *http
|
||||
}
|
||||
|
||||
func (h *webAccountsServiceHandler) DeleteAccount(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
req := &DeleteAccountRequest{}
|
||||
resp := &empty.Empty{}
|
||||
resp := &ptypesempty.Empty{}
|
||||
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
http.Error(w, err.Error(), http.StatusPreconditionFailed)
|
||||
@@ -166,9 +157,7 @@ func (h *webGroupsServiceHandler) ServeHTTP(w http.ResponseWriter, r *http.Reque
|
||||
}
|
||||
|
||||
func (h *webGroupsServiceHandler) ListGroups(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
req := &ListGroupsRequest{}
|
||||
|
||||
resp := &ListGroupsResponse{}
|
||||
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
@@ -190,9 +179,7 @@ func (h *webGroupsServiceHandler) ListGroups(w http.ResponseWriter, r *http.Requ
|
||||
}
|
||||
|
||||
func (h *webGroupsServiceHandler) GetGroup(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
req := &GetGroupRequest{}
|
||||
|
||||
resp := &Group{}
|
||||
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
@@ -214,9 +201,7 @@ func (h *webGroupsServiceHandler) GetGroup(w http.ResponseWriter, r *http.Reques
|
||||
}
|
||||
|
||||
func (h *webGroupsServiceHandler) CreateGroup(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
req := &CreateGroupRequest{}
|
||||
|
||||
resp := &Group{}
|
||||
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
@@ -238,9 +223,7 @@ func (h *webGroupsServiceHandler) CreateGroup(w http.ResponseWriter, r *http.Req
|
||||
}
|
||||
|
||||
func (h *webGroupsServiceHandler) UpdateGroup(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
req := &UpdateGroupRequest{}
|
||||
|
||||
resp := &Group{}
|
||||
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
@@ -262,9 +245,8 @@ func (h *webGroupsServiceHandler) UpdateGroup(w http.ResponseWriter, r *http.Req
|
||||
}
|
||||
|
||||
func (h *webGroupsServiceHandler) DeleteGroup(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
req := &DeleteGroupRequest{}
|
||||
resp := &empty.Empty{}
|
||||
resp := &ptypesempty.Empty{}
|
||||
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
http.Error(w, err.Error(), http.StatusPreconditionFailed)
|
||||
@@ -285,9 +267,7 @@ func (h *webGroupsServiceHandler) DeleteGroup(w http.ResponseWriter, r *http.Req
|
||||
}
|
||||
|
||||
func (h *webGroupsServiceHandler) AddMember(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
req := &AddMemberRequest{}
|
||||
|
||||
resp := &Group{}
|
||||
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
@@ -309,9 +289,7 @@ func (h *webGroupsServiceHandler) AddMember(w http.ResponseWriter, r *http.Reque
|
||||
}
|
||||
|
||||
func (h *webGroupsServiceHandler) RemoveMember(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
req := &RemoveMemberRequest{}
|
||||
|
||||
resp := &Group{}
|
||||
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
@@ -333,9 +311,7 @@ func (h *webGroupsServiceHandler) RemoveMember(w http.ResponseWriter, r *http.Re
|
||||
}
|
||||
|
||||
func (h *webGroupsServiceHandler) ListMembers(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
req := &ListMembersRequest{}
|
||||
|
||||
resp := &ListMembersResponse{}
|
||||
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
@@ -382,9 +358,7 @@ func (h *webIndexServiceHandler) ServeHTTP(w http.ResponseWriter, r *http.Reques
|
||||
}
|
||||
|
||||
func (h *webIndexServiceHandler) RebuildIndex(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
req := &RebuildIndexRequest{}
|
||||
|
||||
resp := &RebuildIndexResponse{}
|
||||
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
|
||||
@@ -389,7 +389,8 @@
|
||||
"description": "The id of the group to add a member to",
|
||||
"in": "path",
|
||||
"required": true,
|
||||
"type": "string"
|
||||
"type": "string",
|
||||
"pattern": "[^/]+"
|
||||
},
|
||||
{
|
||||
"name": "body",
|
||||
@@ -435,7 +436,8 @@
|
||||
"description": "The id of the group to remove a member from",
|
||||
"in": "path",
|
||||
"required": true,
|
||||
"type": "string"
|
||||
"type": "string",
|
||||
"pattern": "[^/]+"
|
||||
},
|
||||
{
|
||||
"name": "accountId",
|
||||
@@ -482,7 +484,8 @@
|
||||
"description": "The id of the group to list members from",
|
||||
"in": "path",
|
||||
"required": true,
|
||||
"type": "string"
|
||||
"type": "string",
|
||||
"pattern": "[^/]+"
|
||||
},
|
||||
{
|
||||
"name": "body",
|
||||
|
||||
Reference in New Issue
Block a user