From 493af58d54e9ea8198440f7bc32f54d79fc3478a Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Wed, 22 Dec 2021 09:19:58 +0100 Subject: [PATCH] add updated proto generation output --- accounts/pkg/proto/v0/accounts.pb.web.go | 32 ++----------------- accounts/pkg/proto/v0/accounts.swagger.json | 9 ++++-- settings/pkg/proto/v0/settings.pb.web.go | 34 ++------------------- 3 files changed, 12 insertions(+), 63 deletions(-) diff --git a/accounts/pkg/proto/v0/accounts.pb.web.go b/accounts/pkg/proto/v0/accounts.pb.web.go index 8391f4f646..139bee0dcb 100644 --- a/accounts/pkg/proto/v0/accounts.pb.web.go +++ b/accounts/pkg/proto/v0/accounts.pb.web.go @@ -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 { diff --git a/accounts/pkg/proto/v0/accounts.swagger.json b/accounts/pkg/proto/v0/accounts.swagger.json index c87b5cee1d..4f02b5ff25 100644 --- a/accounts/pkg/proto/v0/accounts.swagger.json +++ b/accounts/pkg/proto/v0/accounts.swagger.json @@ -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", diff --git a/settings/pkg/proto/v0/settings.pb.web.go b/settings/pkg/proto/v0/settings.pb.web.go index ea9a7d2f92..17995d9abb 100644 --- a/settings/pkg/proto/v0/settings.pb.web.go +++ b/settings/pkg/proto/v0/settings.pb.web.go @@ -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 webBundleServiceHandler struct { @@ -25,9 +25,7 @@ func (h *webBundleServiceHandler) ServeHTTP(w http.ResponseWriter, r *http.Reque } func (h *webBundleServiceHandler) SaveBundle(w http.ResponseWriter, r *http.Request) { - req := &SaveBundleRequest{} - resp := &SaveBundleResponse{} if err := json.NewDecoder(r.Body).Decode(&req); err != nil { @@ -49,9 +47,7 @@ func (h *webBundleServiceHandler) SaveBundle(w http.ResponseWriter, r *http.Requ } func (h *webBundleServiceHandler) GetBundle(w http.ResponseWriter, r *http.Request) { - req := &GetBundleRequest{} - resp := &GetBundleResponse{} if err := json.NewDecoder(r.Body).Decode(&req); err != nil { @@ -73,9 +69,7 @@ func (h *webBundleServiceHandler) GetBundle(w http.ResponseWriter, r *http.Reque } func (h *webBundleServiceHandler) ListBundles(w http.ResponseWriter, r *http.Request) { - req := &ListBundlesRequest{} - resp := &ListBundlesResponse{} if err := json.NewDecoder(r.Body).Decode(&req); err != nil { @@ -97,9 +91,7 @@ func (h *webBundleServiceHandler) ListBundles(w http.ResponseWriter, r *http.Req } func (h *webBundleServiceHandler) AddSettingToBundle(w http.ResponseWriter, r *http.Request) { - req := &AddSettingToBundleRequest{} - resp := &AddSettingToBundleResponse{} if err := json.NewDecoder(r.Body).Decode(&req); err != nil { @@ -121,9 +113,8 @@ func (h *webBundleServiceHandler) AddSettingToBundle(w http.ResponseWriter, r *h } func (h *webBundleServiceHandler) RemoveSettingFromBundle(w http.ResponseWriter, r *http.Request) { - req := &RemoveSettingFromBundleRequest{} - 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 *webValueServiceHandler) ServeHTTP(w http.ResponseWriter, r *http.Reques } func (h *webValueServiceHandler) SaveValue(w http.ResponseWriter, r *http.Request) { - req := &SaveValueRequest{} - resp := &SaveValueResponse{} if err := json.NewDecoder(r.Body).Decode(&req); err != nil { @@ -190,9 +179,7 @@ func (h *webValueServiceHandler) SaveValue(w http.ResponseWriter, r *http.Reques } func (h *webValueServiceHandler) GetValue(w http.ResponseWriter, r *http.Request) { - req := &GetValueRequest{} - resp := &GetValueResponse{} if err := json.NewDecoder(r.Body).Decode(&req); err != nil { @@ -214,9 +201,7 @@ func (h *webValueServiceHandler) GetValue(w http.ResponseWriter, r *http.Request } func (h *webValueServiceHandler) ListValues(w http.ResponseWriter, r *http.Request) { - req := &ListValuesRequest{} - resp := &ListValuesResponse{} if err := json.NewDecoder(r.Body).Decode(&req); err != nil { @@ -238,9 +223,7 @@ func (h *webValueServiceHandler) ListValues(w http.ResponseWriter, r *http.Reque } func (h *webValueServiceHandler) GetValueByUniqueIdentifiers(w http.ResponseWriter, r *http.Request) { - req := &GetValueByUniqueIdentifiersRequest{} - resp := &GetValueResponse{} if err := json.NewDecoder(r.Body).Decode(&req); err != nil { @@ -283,9 +266,7 @@ func (h *webRoleServiceHandler) ServeHTTP(w http.ResponseWriter, r *http.Request } func (h *webRoleServiceHandler) ListRoles(w http.ResponseWriter, r *http.Request) { - req := &ListBundlesRequest{} - resp := &ListBundlesResponse{} if err := json.NewDecoder(r.Body).Decode(&req); err != nil { @@ -307,9 +288,7 @@ func (h *webRoleServiceHandler) ListRoles(w http.ResponseWriter, r *http.Request } func (h *webRoleServiceHandler) ListRoleAssignments(w http.ResponseWriter, r *http.Request) { - req := &ListRoleAssignmentsRequest{} - resp := &ListRoleAssignmentsResponse{} if err := json.NewDecoder(r.Body).Decode(&req); err != nil { @@ -331,9 +310,7 @@ func (h *webRoleServiceHandler) ListRoleAssignments(w http.ResponseWriter, r *ht } func (h *webRoleServiceHandler) AssignRoleToUser(w http.ResponseWriter, r *http.Request) { - req := &AssignRoleToUserRequest{} - resp := &AssignRoleToUserResponse{} if err := json.NewDecoder(r.Body).Decode(&req); err != nil { @@ -355,9 +332,8 @@ func (h *webRoleServiceHandler) AssignRoleToUser(w http.ResponseWriter, r *http. } func (h *webRoleServiceHandler) RemoveRoleFromUser(w http.ResponseWriter, r *http.Request) { - req := &RemoveRoleFromUserRequest{} - resp := &empty.Empty{} + resp := &ptypesempty.Empty{} if err := json.NewDecoder(r.Body).Decode(&req); err != nil { http.Error(w, err.Error(), http.StatusPreconditionFailed) @@ -399,9 +375,7 @@ func (h *webPermissionServiceHandler) ServeHTTP(w http.ResponseWriter, r *http.R } func (h *webPermissionServiceHandler) ListPermissionsByResource(w http.ResponseWriter, r *http.Request) { - req := &ListPermissionsByResourceRequest{} - resp := &ListPermissionsByResourceResponse{} if err := json.NewDecoder(r.Body).Decode(&req); err != nil { @@ -423,9 +397,7 @@ func (h *webPermissionServiceHandler) ListPermissionsByResource(w http.ResponseW } func (h *webPermissionServiceHandler) GetPermissionByID(w http.ResponseWriter, r *http.Request) { - req := &GetPermissionByIDRequest{} - resp := &GetPermissionByIDResponse{} if err := json.NewDecoder(r.Body).Decode(&req); err != nil {