luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #12442 from danieleva/12422-keyring 

Allows keyring operations on client agents
This commit is contained in:
Chris S. Kim 2022-02-25 16:28:56 -05:00 committed by GitHub
parent ef929629cf 2cb1017e13
commit aea00f10ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/12442.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:enhancement
agent: Allow client agents to perform keyring operations
```

3
agent/keyring.go
View File

@ -233,9 +233,6 @@ func decodeStringKey(key string) ([]byte, error) {
func (a *Agent) keyringProcess(args *structs.KeyringRequest) (*structs.KeyringResponses, error) { func (a *Agent) keyringProcess(args *structs.KeyringRequest) (*structs.KeyringResponses, error) {
var reply structs.KeyringResponses 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 { if err := a.RPC("Internal.KeyringOperation", args, &reply); err != nil {
return &reply, err return &reply, err
} }