Browse Source

Merge pull request #12442 from danieleva/12422-keyring

Allows keyring operations on client agents
pull/12088/head
Chris S. Kim 3 years ago committed by GitHub
parent
commit
25f4a425d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      .changelog/12442.txt
  2. 3
      agent/keyring.go

3
.changelog/12442.txt

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

3
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
}

Loading…
Cancel
Save