Merge pull request #11135 from matejvasek/fix_ts

Fix TS parsing for fractional values
This commit is contained in:
openshift-ci[bot] 2021-08-05 17:45:31 +00:00 committed by GitHub
commit b243185e4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 2 deletions

View File

@ -3,6 +3,7 @@ package util
import (
"encoding/json"
"fmt"
"math"
"os"
"os/user"
"path/filepath"
@ -530,9 +531,10 @@ func ParseInputTime(inputTime string) (time.Time, error) {
}
}
unixTimestamp, err := strconv.ParseInt(inputTime, 10, 64)
unixTimestamp, err := strconv.ParseFloat(inputTime, 64)
if err == nil {
return time.Unix(unixTimestamp, 0), nil
iPart, fPart := math.Modf(unixTimestamp)
return time.Unix(int64(iPart), int64(fPart*1_000_000_000)).UTC(), nil
}
// input might be a duration

View File

@ -2,6 +2,7 @@ package util
import (
"testing"
"time"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@ -277,3 +278,17 @@ func TestPeriodAndQuotaToCores(t *testing.T) {
assert.Equal(t, PeriodAndQuotaToCores(period, quota), expectedCores)
}
func TestParseInputTime(t *testing.T) {
tm, err := ParseInputTime("1.5")
if err != nil {
t.Errorf("expected error to be nil but was: %v", err)
}
expected, err := time.ParseInLocation(time.RFC3339Nano, "1970-01-01T00:00:01.500000000Z", time.UTC)
if err != nil {
t.Fatal(err)
}
assert.Equal(t, expected, tm)
}