From 078e678a34faea5a8a082748f437e734014b81ff Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Fri, 15 Mar 2019 14:55:46 -0400 Subject: [PATCH] MM-14620 Specify parameter name for PluginAPI.GetUsers (#10456) This is to fix the generated code so that it actually passes arguments correctly. If you look at the diff, the client-side call doesn't actually pass any values for the unnamed parameter. I also filed https://mattermost.atlassian.net/browse/MM-14621 in case we want to actually fix the generator code. #### Ticket Link https://mattermost.atlassian.net/browse/MM-14620 --- plugin/api.go | 2 +- plugin/client_rpc_generated.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugin/api.go b/plugin/api.go index c8441b04f4..d5d6b4fa97 100644 --- a/plugin/api.go +++ b/plugin/api.go @@ -74,7 +74,7 @@ type API interface { // GetUsers a list of users based on search options. // // Minimum server version: 5.10 - GetUsers(*model.UserGetOptions) ([]*model.User, *model.AppError) + GetUsers(options *model.UserGetOptions) ([]*model.User, *model.AppError) // GetUser gets a user. GetUser(userId string) (*model.User, *model.AppError) diff --git a/plugin/client_rpc_generated.go b/plugin/client_rpc_generated.go index dbde8bcd5a..bf9b49b369 100644 --- a/plugin/client_rpc_generated.go +++ b/plugin/client_rpc_generated.go @@ -846,8 +846,8 @@ type Z_GetUsersReturns struct { B *model.AppError } -func (g *apiRPCClient) GetUsers(*model.UserGetOptions) ([]*model.User, *model.AppError) { - _args := &Z_GetUsersArgs{} +func (g *apiRPCClient) GetUsers(options *model.UserGetOptions) ([]*model.User, *model.AppError) { + _args := &Z_GetUsersArgs{options} _returns := &Z_GetUsersReturns{} if err := g.client.Call("Plugin.GetUsers", _args, _returns); err != nil { log.Printf("RPC call to GetUsers API failed: %s", err.Error()) @@ -857,7 +857,7 @@ func (g *apiRPCClient) GetUsers(*model.UserGetOptions) ([]*model.User, *model.Ap func (s *apiRPCServer) GetUsers(args *Z_GetUsersArgs, returns *Z_GetUsersReturns) error { if hook, ok := s.impl.(interface { - GetUsers(*model.UserGetOptions) ([]*model.User, *model.AppError) + GetUsers(options *model.UserGetOptions) ([]*model.User, *model.AppError) }); ok { returns.A, returns.B = hook.GetUsers(args.A) } else {