upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-06-09 00:33:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Allow Default for TimeDurationSecond values to be time.Duration (#6934)

Browse source
This commit is contained in:
Jeff Mitchell 2019-06-20 12:28:15 -04:00 committed by GitHub
parent 6183eb4bf5
commit 9c68bf2a20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sdk/framework/backend.go
View file

@ -579,6 +579,8 @@ func (s *FieldSchema) DefaultOrZero() interface{} {
return s.Type.Zero()
}
result = int(valInt64)
case time.Duration:
result = int(inp.Seconds())
default:
return s.Type.Zero()
}

5
sdk/framework/backend_test.go
View file

@ -564,6 +564,11 @@ func TestFieldSchemaDefaultOrZero(t *testing.T) {
60,
},
"default duration time.Duration": {
&FieldSchema{Type: TypeDurationSecond, Default: 60 * time.Second},
60,
},
"default duration not set": {
&FieldSchema{Type: TypeDurationSecond},
0,