Merge pull request #949 from gravitational/rjones/roles-set-defaults

Use CheckAndSetDefaults in tctl and add KindNode to default list of
This commit is contained in:
Russell Jones 2017-04-20 15:27:22 -07:00 committed by GitHub
commit 52cb7843be
3 changed files with 7 additions and 0 deletions

View file

@ -147,6 +147,8 @@ type Role interface {
CanForwardAgent() bool
// SetForwardAgent sets forward agent property
SetForwardAgent(forwardAgent bool)
// CheckAndSetDefaults checks and set default values for missing fields.
CheckAndSetDefaults() error
}
// RoleV2 represents role resource specification

View file

@ -21,6 +21,7 @@ var adminResources = []string{
teleservices.KindCertAuthority,
teleservices.KindReverseTunnel,
teleservices.KindTrustedCluster,
teleservices.KindNode,
}
// AdminAccess describes admin access

View file

@ -998,6 +998,10 @@ func (u *CreateCommand) Create(client *auth.TunClient) error {
if err != nil {
return trace.Wrap(err)
}
err = role.CheckAndSetDefaults()
if err != nil {
return trace.Wrap(err)
}
if err := client.UpsertRole(role, backend.Forever); err != nil {
return trace.Wrap(err)
}