Skip to content

Commit

Permalink
backport of commit 884840a (hashicorp#20440)
Browse files Browse the repository at this point in the history
Co-authored-by: miagilepner <mia.epner@hashicorp.com>
  • Loading branch information
1 parent 1ed28d9 commit f417069
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 2 deletions.
3 changes: 3 additions & 0 deletions changelog/20368.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
core/identity: Allow updates of only the custom-metadata for entity alias.
```
5 changes: 3 additions & 2 deletions vault/identity_store_aliases.go
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,9 @@ func (i *IdentityStore) handleAliasCreateUpdate() framework.OperationFunc {
}
switch {
case mountAccessor == "" && name == "":
// Just a canonical ID update, maybe
if canonicalID == "" {
// Check if the canonicalID or the customMetadata are being
// updated
if canonicalID == "" && !customMetadataExists {
// Nothing to do, so be idempotent
return nil, nil
}
Expand Down
40 changes: 40 additions & 0 deletions vault/identity_store_aliases_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,46 @@ func TestIdentityStore_AliasUpdate(t *testing.T) {
"custom_metadata": map[string]string{},
},
},
{
name: "only-metadata",
createData: map[string]interface{}{
"name": "only",
"mount_accessor": githubAccessor,
"custom_metadata": map[string]string{
"foo": "bar",
},
},
updateData: map[string]interface{}{
"custom_metadata": map[string]string{
"bar": "baz",
},
},
},
{
name: "only-metadata-clear",
createData: map[string]interface{}{
"name": "only-clear",
"mount_accessor": githubAccessor,
"custom_metadata": map[string]string{
"foo": "bar",
},
},
updateData: map[string]interface{}{
"custom_metadata": map[string]string{},
},
},
{
name: "only-metadata-none-before",
createData: map[string]interface{}{
"name": "no-metadata",
"mount_accessor": githubAccessor,
},
updateData: map[string]interface{}{
"custom_metadata": map[string]string{
"foo": "bar",
},
},
},
}

handleRequest := func(t *testing.T, req *logical.Request) *logical.Response {
Expand Down

0 comments on commit f417069

Please sign in to comment.