Merge branch '15107-google-login'

[arvados.git] / sdk / go / arvados / duration.go

diff --git a/sdk/go/arvados/duration.go b/sdk/go/arvados/duration.go
index 2696fdb051146ca34bd311e7e29e1092b0a3723e..ee482fdf3150f6a2baf126d4d540f2479fe6ba69 100644 (file)
--- a/sdk/go/arvados/duration.go
+++ b/sdk/go/arvados/duration.go
@@ -20,7 +20,9 @@ func (d *Duration) UnmarshalJSON(data []byte) error {
        if data[0] == '"' {
                return d.Set(string(data[1 : len(data)-1]))
        }
-       return fmt.Errorf("duration must be given as a string like \"600s\" or \"1h30m\"")
+       // Mimic error message returned by ParseDuration for a number
+       // without units.
+       return fmt.Errorf("missing unit in duration %s", data)
 }
 
 // MarshalJSON implements json.Marshaler.