From 6c07fb1adda021375e7e263f537a5cc713e1d30a Mon Sep 17 00:00:00 2001 From: Brian Kassouf Date: Tue, 3 Oct 2017 13:58:58 -0700 Subject: [PATCH 1/2] Allow for response errors to be passed back from a plugin --- logical/plugin/backend_client.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/logical/plugin/backend_client.go b/logical/plugin/backend_client.go index cc2d83bcfb5e..aeddd8b382dc 100644 --- a/logical/plugin/backend_client.go +++ b/logical/plugin/backend_client.go @@ -117,10 +117,9 @@ func (b *backendPluginClient) HandleRequest(req *logical.Request) (*logical.Resp if reply.Error.Error() == logical.ErrUnsupportedOperation.Error() { return nil, logical.ErrUnsupportedOperation } - return nil, reply.Error } - return reply.Response, nil + return reply.Response, reply.Error } func (b *backendPluginClient) SpecialPaths() *logical.Paths { From d8d3e663aa97cf90dd02dc6bf8034df47922f9fe Mon Sep 17 00:00:00 2001 From: Brian Kassouf Date: Thu, 5 Oct 2017 16:22:42 -0700 Subject: [PATCH 2/2] Fix issue with checking plugin.BasicError == nil --- logical/plugin/backend_client.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/logical/plugin/backend_client.go b/logical/plugin/backend_client.go index aeddd8b382dc..c3b53afd8b16 100644 --- a/logical/plugin/backend_client.go +++ b/logical/plugin/backend_client.go @@ -117,9 +117,11 @@ func (b *backendPluginClient) HandleRequest(req *logical.Request) (*logical.Resp if reply.Error.Error() == logical.ErrUnsupportedOperation.Error() { return nil, logical.ErrUnsupportedOperation } + + return reply.Response, reply.Error } - return reply.Response, reply.Error + return reply.Response, nil } func (b *backendPluginClient) SpecialPaths() *logical.Paths {