krd/vault-redux
1
0
Fork 0
Code

backport of commit 4a7bee5a02db880d543692386ccd597f33e29624 (#24331)

Browse Source 
Co-authored-by: Mike Palmiotto <mike.palmiotto@hashicorp.com>
This commit is contained in:
hc-github-team-secure-vault-core 2023-12-01 10:11:04 -05:00 committed by GitHub
parent 9f23d723b2
commit b87d3488d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changelog/24325.txt Normal file
View File

@ -0,0 +1,4 @@
```release-note:change
identity (enterprise): POST requests to the `/identity/entity/merge` endpoint
are now always forwarded from standbys to the active node.
```

3
vault/identity_store_entities.go
View File

@ -231,7 +231,8 @@ func entityPaths(i *IdentityStore) []*framework.Path {
},
Operations: map[logical.Operation]framework.OperationHandler{
logical.UpdateOperation: &framework.PathOperation{
Callback: i.pathEntityMergeID(),
Callback: i.pathEntityMergeID(),
ForwardPerformanceStandby: true,
},
},