From e76ca318dcb502037d685b16e3200462ba418eb4 Mon Sep 17 00:00:00 2001 From: Daniele Vazzola Date: Thu, 24 Feb 2022 17:23:45 +0000 Subject: [PATCH 1/2] Allows keyring operations on client agents --- agent/keyring.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/agent/keyring.go b/agent/keyring.go index c6a91e2b74..506da70f74 100644 --- a/agent/keyring.go +++ b/agent/keyring.go @@ -233,9 +233,6 @@ func decodeStringKey(key string) ([]byte, error) { func (a *Agent) keyringProcess(args *structs.KeyringRequest) (*structs.KeyringResponses, error) { var reply structs.KeyringResponses - if _, ok := a.delegate.(*consul.Server); !ok { - return nil, fmt.Errorf("keyring operations must run against a server node") - } if err := a.RPC("Internal.KeyringOperation", args, &reply); err != nil { return &reply, err } From b32a0b2135305f2256a1645ffa577007eabfc1d9 Mon Sep 17 00:00:00 2001 From: Daniele Vazzola Date: Fri, 25 Feb 2022 15:43:00 +0000 Subject: [PATCH 2/2] Adds changelog --- .changelog/12442.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/12442.txt diff --git a/.changelog/12442.txt b/.changelog/12442.txt new file mode 100644 index 0000000000..d9fbc28b28 --- /dev/null +++ b/.changelog/12442.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +agent: Allow client agents to perform keyring operations +```