Skip to content

Commit

Permalink
Fixed minor things
Browse files Browse the repository at this point in the history
  • Loading branch information
michelvocks committed Jun 27, 2019
1 parent a2d0c98 commit a7b05ae
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions vault/token_store.go
Original file line number Diff line number Diff line change
Expand Up @@ -3244,8 +3244,6 @@ func (ts *TokenStore) tokenStoreRoleCreateUpdate(ctx context.Context, req *logic
allowedEntityAliasesRaw, ok := data.GetOk("allowed_entity_aliases")
if ok {
entry.AllowedEntityAliases = strutil.RemoveDuplicates(allowedEntityAliasesRaw.([]string), true)
} else if req.Operation == logical.CreateOperation {
entry.AllowedEntityAliases = strutil.RemoveDuplicates(data.Get("allowed_entity_aliases").([]string), true)
}

ns, err := namespace.FromContext(ctx)
Expand Down
2 changes: 1 addition & 1 deletion website/source/api/auth/token/index.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ during this call.
- `period` `(string: "")` - If specified, the token will be periodic; it will have
no maximum TTL (unless an "explicit-max-ttl" is also set) but every renewal
will use the given period. Requires a root/sudo token to use.
- `entity_alias` `string: "")` - Name of the entity alias to associate with
- `entity_alias` `(string: "")` - Name of the entity alias to associate with
during token creation. Only works in combination with `role_name` argument
and used entity alias must be listed in `allowed_entity_aliases`. If this has
been specified, the entity will not be inherited from the parent.
Expand Down

0 comments on commit a7b05ae

Please sign in to comment.