Refactor name, fix string

pkg/cloud/gcpprovider.go

@@ -135,7 +135,7 @@ func (gcp *GCP) GetLocalStorageQuery(window, offset time.Duration, rate bool, us
 		baseMetric = "container_fs_usage_bytes"
 	}
 
-	fmtOffset := timeutil.DurationToPromString(offset)
+	fmtOffset := timeutil.DurationToPromOffsetString(offset)
 
 	fmtCumulativeQuery := `sum(
 		sum_over_time(%s{device!="tmpfs", id="/"}[%s:1m]%s)

pkg/costmodel/aggregation.go

@@ -1748,10 +1748,10 @@ func (a *Accesses) warmAggregateCostModelCache() {
 			log.Infof("Setting Offset to %s", duration)
 		}
 		fmtDuration, fmtOffset := timeutil.DurationOffsetStrings(duration, offset)
-		durationHrs, err := timeutil.DayDurationToHourDuration(fmtDuration)
+		durationHrs, err := timeutil.FormatDurationStringDaysToHours(fmtDuration)
 		promClient := a.GetPrometheusClient(true)
 
-		windowStr := fmt.Sprintf("%s fmtOffset %s", fmtDuration, fmtOffset)
+		windowStr := fmt.Sprintf("%s offset %s", fmtDuration, fmtOffset)
 		window, err := kubecost.ParseWindowUTC(windowStr)
 		if err != nil {
 			return nil, fmt.Errorf("invalid window from window string: %s", windowStr)

pkg/costmodel/cluster.go

@@ -772,7 +772,7 @@ func (a *Accesses) ComputeClusterCosts(client prometheus.Client, provider cloud.
 		queryTotalLocalStorage = fmt.Sprintf(" + %s", queryTotalLocalStorage)
 	}
 
-	fmtOffset := timeutil.DurationToPromString(offset)
+	fmtOffset := timeutil.DurationToPromOffsetString(offset)
 
 	queryDataCount := fmt.Sprintf(fmtQueryDataCount, env.GetPromClusterLabel(), window, minsPerResolution, fmtOffset, minsPerResolution)
 	queryTotalGPU := fmt.Sprintf(fmtQueryTotalGPU, window, minsPerResolution, fmtOffset, hourlyToCumulative, env.GetPromClusterLabel())
@@ -1072,7 +1072,7 @@ func ClusterCostsOverTime(cli prometheus.Client, provider cloud.Provider, startS
 		return nil, err
 	}
 
-	fmtOffset := timeutil.DurationToPromString(offset)
+	fmtOffset := timeutil.DurationToPromOffsetString(offset)
 
 	qCores := fmt.Sprintf(queryClusterCores, fmtWindow, fmtOffset, env.GetPromClusterLabel(), fmtWindow, fmtOffset, env.GetPromClusterLabel(), fmtWindow, fmtOffset, env.GetPromClusterLabel(), env.GetPromClusterLabel())
 	qRAM := fmt.Sprintf(queryClusterRAM, fmtWindow, fmtOffset, env.GetPromClusterLabel(), fmtWindow, fmtOffset, env.GetPromClusterLabel(), env.GetPromClusterLabel())

pkg/util/timeutil/timeutil.go

@@ -60,8 +60,8 @@ func DurationString(duration time.Duration) string {
 	return durStr
 }
 
-// DurationToPromString returns a Prometheus formatted string with leading offset or empty string if given a negative duration
-func DurationToPromString(duration time.Duration) string {
+// DurationToPromOffsetString returns a Prometheus formatted string with leading offset or empty string if given a negative duration
+func DurationToPromOffsetString(duration time.Duration) string {
 	dirStr := DurationString(duration)
 	if dirStr != "" {
 		dirStr = fmt.Sprintf("offset %s", dirStr)
@@ -140,12 +140,12 @@ func ParseTimeRange(duration, offset time.Duration) (time.Time, time.Time) {
 	return startTime, endTime
 }
 
-// DayDurationToHourDuration converts string from format [0-9+]d to [0-9+]h
-func DayDurationToHourDuration(param string) (string, error) {
+// FormatDurationStringDaysToHours converts string from format [0-9+]d to [0-9+]h
+func FormatDurationStringDaysToHours(param string) (string, error) {
 	//check that input matches format
 	ok, err := regexp.MatchString("[0-9+]d", param)
 	if !ok {
-		return param, fmt.Errorf("DayDurationToHourDuration: input string (%s) not formatted as [0-9+]d", param)
+		return param, fmt.Errorf("FormatDurationStringDaysToHours: input string (%s) not formatted as [0-9+]d", param)
 	}
 	if err != nil {
 		return "", err

pkg/util/timeutil/timeutil_test.go

@@ -59,7 +59,7 @@ func Test_DurationString(t *testing.T) {
 	}
 }
 
-func Test_DurationToPromString(t *testing.T) {
+func Test_DurationToPromOffsetString(t *testing.T) {
 	testCases := map[string]struct {
 		duration time.Duration
 		expectedDuration string
@@ -105,7 +105,7 @@ func Test_DurationToPromString(t *testing.T) {
 
 	for name, test := range testCases {
 		t.Run(name, func(t *testing.T) {
-			dur := DurationToPromString(test.duration)
+			dur := DurationToPromOffsetString(test.duration)
 			if dur != test.expectedDuration {
 				t.Fatalf("DurationOffsetStrings: exp (%s); act (%s)", test.expectedDuration, dur)
 			}
@@ -335,7 +335,7 @@ func Test_CleanDurationString(t *testing.T) {
 	}
 }
 
-func Test_DayDurationToHourDuration(t *testing.T) {
+func Test_FormatDurationStringDaysToHours(t *testing.T) {
 	testCases := map[string]struct {
 		input    string
 		expected string
@@ -372,7 +372,7 @@ func Test_DayDurationToHourDuration(t *testing.T) {
 	}
 	for name, test := range testCases {
 		t.Run(name, func(t *testing.T) {
-			res, _ := DayDurationToHourDuration(test.input)
+			res, _ := FormatDurationStringDaysToHours(test.input)
 			if res != test.expected {
 				t.Errorf("Expected output %s did not match result %s", test.expected, res)
 			}