Remove offset templating in the handler, which is now being done in the ClusterCosts funciton itself

costmodel/cluster.go

@@ -214,6 +214,11 @@ func ClusterCostsOverTime(cli prometheusClient.Client, cloud costAnalyzerCloud.P
 		return nil, err
 	}
 
+	// turn offsets of the format "[0-9+]h" into the format "offset [0-9+]h" for use in query templatess
+	if offset != "" {
+		offset = fmt.Sprintf("offset %s", offset)
+	}
+
 	qCores := fmt.Sprintf(queryClusterCores, offset, offset, offset)
 	qRAM := fmt.Sprintf(queryClusterRAM, offset, offset)
 	qStorage := fmt.Sprintf(queryStorage, windowString, offset, windowString, offset, localStorageQuery)

costmodel/router.go

@@ -231,10 +231,6 @@ func (a *Accesses) ClusterCosts(w http.ResponseWriter, r *http.Request, ps httpr
 	window := r.URL.Query().Get("window")
 	offset := r.URL.Query().Get("offset")
 
-	if offset != "" {
-		offset = "offset " + offset
-	}
-
 	data, err := ClusterCosts(a.PrometheusClient, a.Cloud, window, offset)
 	w.Write(wrapData(data, err))
 }
@@ -248,10 +244,6 @@ func (a *Accesses) ClusterCostsOverTime(w http.ResponseWriter, r *http.Request,
 	window := r.URL.Query().Get("window")
 	offset := r.URL.Query().Get("offset")
 
-	if offset != "" {
-		offset = "offset " + offset
-	}
-
 	data, err := ClusterCostsOverTime(a.PrometheusClient, a.Cloud, start, end, window, offset)
 	w.Write(wrapData(data, err))
 }