Fix ci

Signed-off-by: SungJin1212 <[email protected]>

Author: SungJin1212

pkg/util/api/parse.go

@@ -79,7 +79,7 @@ func ParseTime(s string) (time.Time, error) {
 func ParseTimeMillis(s string) (int64, error) {
 	t, err := ParseTime(s)
 	if err != nil {
-		return 0, httpgrpc.Errorf(http.StatusBadRequest, err.Error())
+		return 0, httpgrpc.Errorf(http.StatusBadRequest, "%s", err.Error())
 	}
 
 	return util.TimeToMillis(t), nil
@@ -102,7 +102,7 @@ func ParseDuration(s string) (time.Duration, error) {
 func ParseDurationMillis(s string) (int64, error) {
 	d, err := ParseDuration(s)
 	if err != nil {
-		return 0, httpgrpc.Errorf(http.StatusBadRequest, err.Error())
+		return 0, httpgrpc.Errorf(http.StatusBadRequest, "%s", err.Error())
 	}
 
 	return int64(d / (time.Millisecond / time.Nanosecond)), nil
@@ -123,7 +123,7 @@ func ParseTimeParam(r *http.Request, paramName string, defaultValue time.Time) (
 func ParseTimeParamMillis(r *http.Request, paramName string, defaultValue time.Time) (int64, error) {
 	t, err := ParseTimeParam(r, paramName, defaultValue)
 	if err != nil {
-		return 0, httpgrpc.Errorf(http.StatusBadRequest, err.Error())
+		return 0, httpgrpc.Errorf(http.StatusBadRequest, "%s", err.Error())
 	}
 
 	return util.TimeToMillis(t), nil

pkg/util/api/parse_test.go

@@ -9,6 +9,9 @@ import (
 
 	"github.com/prometheus/prometheus/promql/parser"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"github.com/cortexproject/cortex/pkg/util"
 )
 
 func TestFindMinMaxTime(t *testing.T) {
@@ -63,3 +66,53 @@ func TestFindMinMaxTime(t *testing.T) {
 		})
 	}
 }
+
+func TestParseTime(t *testing.T) {
+	var tests = []struct {
+		input  string
+		fail   bool
+		result time.Time
+	}{
+		{
+			input: "",
+			fail:  true,
+		}, {
+			input: "abc",
+			fail:  true,
+		}, {
+			input: "30s",
+			fail:  true,
+		}, {
+			input:  "123",
+			result: time.Unix(123, 0),
+		}, {
+			input:  "123.123",
+			result: time.Unix(123, 123000000),
+		}, {
+			input:  "2015-06-03T13:21:58.555Z",
+			result: time.Unix(1433337718, 555*time.Millisecond.Nanoseconds()),
+		}, {
+			input:  "2015-06-03T14:21:58.555+01:00",
+			result: time.Unix(1433337718, 555*time.Millisecond.Nanoseconds()),
+		}, {
+			// Test nanosecond rounding.
+			input:  "2015-06-03T13:21:58.56789Z",
+			result: time.Unix(1433337718, 567*1e6),
+		}, {
+			// Test float rounding.
+			input:  "1543578564.705",
+			result: time.Unix(1543578564, 705*1e6),
+		},
+	}
+
+	for _, test := range tests {
+		ts, err := ParseTimeMillis(test.input)
+		if test.fail {
+			require.Error(t, err)
+			continue
+		}
+
+		require.NoError(t, err)
+		assert.Equal(t, util.TimeToMillis(test.result), ts)
+	}
+}

pkg/util/time_test.go

@@ -9,7 +9,6 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/atomic"
 
-	"github.com/cortexproject/cortex/pkg/util/api"
 	"github.com/cortexproject/cortex/pkg/util/test"
 )
 
@@ -58,56 +57,6 @@ func TestDurationWithPositiveJitter_ZeroInputDuration(t *testing.T) {
 	assert.Equal(t, time.Duration(0), DurationWithPositiveJitter(time.Duration(0), 0.5))
 }
 
-func TestParseTime(t *testing.T) {
-	var tests = []struct {
-		input  string
-		fail   bool
-		result time.Time
-	}{
-		{
-			input: "",
-			fail:  true,
-		}, {
-			input: "abc",
-			fail:  true,
-		}, {
-			input: "30s",
-			fail:  true,
-		}, {
-			input:  "123",
-			result: time.Unix(123, 0),
-		}, {
-			input:  "123.123",
-			result: time.Unix(123, 123000000),
-		}, {
-			input:  "2015-06-03T13:21:58.555Z",
-			result: time.Unix(1433337718, 555*time.Millisecond.Nanoseconds()),
-		}, {
-			input:  "2015-06-03T14:21:58.555+01:00",
-			result: time.Unix(1433337718, 555*time.Millisecond.Nanoseconds()),
-		}, {
-			// Test nanosecond rounding.
-			input:  "2015-06-03T13:21:58.56789Z",
-			result: time.Unix(1433337718, 567*1e6),
-		}, {
-			// Test float rounding.
-			input:  "1543578564.705",
-			result: time.Unix(1543578564, 705*1e6),
-		},
-	}
-
-	for _, test := range tests {
-		ts, err := api.ParseTime(test.input)
-		if test.fail {
-			require.Error(t, err)
-			continue
-		}
-
-		require.NoError(t, err)
-		assert.Equal(t, TimeToMillis(test.result), ts)
-	}
-}
-
 func TestNewDisableableTicker_Enabled(t *testing.T) {
 	stop, ch := NewDisableableTicker(10 * time.Millisecond)
 	defer stop()