|
|
@ -12,6 +12,16 @@ type Duration struct {
|
|
|
|
time.Duration
|
|
|
|
time.Duration
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// NewDuration parses a duration string and returns a Duration type or and error
|
|
|
|
|
|
|
|
// if the given string is not a duration.
|
|
|
|
|
|
|
|
func NewDuration(s string) (*Duration, error) {
|
|
|
|
|
|
|
|
d, err := time.ParseDuration(s)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
|
|
return nil, errors.Wrapf(err, "error parsing %s as duration", s)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return &Duration{Duration: d}, nil
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// MarshalJSON parses a duration string and sets it to the duration.
|
|
|
|
// MarshalJSON parses a duration string and sets it to the duration.
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// A duration string is a possibly signed sequence of decimal numbers, each with
|
|
|
|
// A duration string is a possibly signed sequence of decimal numbers, each with
|
|
|
@ -29,7 +39,7 @@ func (d *Duration) MarshalJSON() ([]byte, error) {
|
|
|
|
func (d *Duration) UnmarshalJSON(data []byte) (err error) {
|
|
|
|
func (d *Duration) UnmarshalJSON(data []byte) (err error) {
|
|
|
|
var (
|
|
|
|
var (
|
|
|
|
s string
|
|
|
|
s string
|
|
|
|
_d time.Duration
|
|
|
|
dd time.Duration
|
|
|
|
)
|
|
|
|
)
|
|
|
|
if d == nil {
|
|
|
|
if d == nil {
|
|
|
|
return errors.New("duration cannot be nil")
|
|
|
|
return errors.New("duration cannot be nil")
|
|
|
@ -37,10 +47,10 @@ func (d *Duration) UnmarshalJSON(data []byte) (err error) {
|
|
|
|
if err = json.Unmarshal(data, &s); err != nil {
|
|
|
|
if err = json.Unmarshal(data, &s); err != nil {
|
|
|
|
return errors.Wrapf(err, "error unmarshaling %s", data)
|
|
|
|
return errors.Wrapf(err, "error unmarshaling %s", data)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if _d, err = time.ParseDuration(s); err != nil {
|
|
|
|
if dd, err = time.ParseDuration(s); err != nil {
|
|
|
|
return errors.Wrapf(err, "error parsing %s as duration", s)
|
|
|
|
return errors.Wrapf(err, "error parsing %s as duration", s)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
d.Duration = _d
|
|
|
|
d.Duration = dd
|
|
|
|
return
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|