Merge 6d2e589 into backport/VAULT-4074/identity-alias-clear-custom-me…

…tadata/primarily-bright-lionfish
hashicorp · Jan 19, 2022 · 5debdfa · 5debdfa
2 parents dc59d41 + 6d2e589
commit 5debdfa
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/vault/identity_store_aliases.go b/vault/identity_store_aliases.go
@@ -8,7 +8,6 @@ import (
 	"github.com/golang/protobuf/ptypes"
 	"github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/go-secure-stdlib/strutil"
-	"github.com/mitchellh/mapstructure"
 
 	"github.com/hashicorp/vault/helper/identity"
 	"github.com/hashicorp/vault/helper/namespace"
@@ -141,10 +140,7 @@ func (i *IdentityStore) handleAliasCreateUpdate() framework.OperationFunc {
 		customMetadata := make(map[string]string)
 		data, customMetadataExists := d.GetOk("custom_metadata")
 		if customMetadataExists {
-			err = mapstructure.Decode(data, &customMetadata)
-			if err != nil {
-				return nil, err
-			}
+			customMetadata = data.(map[string]string)
 		}
 
 		// Get entity id