refactor: include scheme in base URL for metrics

don't assume it's always `https`, so we can be more flexible when testing against an `http` endpoint

Signed-off-by: Xavier Coulon <xcoulon@redhat.com>

Author: xcoulon

testsupport/init.go

@@ -207,12 +207,12 @@ func WaitForDeployments(t *testing.T) wait.Awaitilities {
 		// setup host metrics route for metrics verification in tests
 		hostMetricsRoute, err := initHostAwait.SetupRouteForService(t, "host-operator-metrics-service", "/metrics")
 		require.NoError(t, err)
-		initHostAwait.MetricsURL = hostMetricsRoute.Status.Ingress[0].Host
+		initHostAwait.MetricsURL = "https://" + hostMetricsRoute.Status.Ingress[0].Host
 
 		// setup member metrics route for metrics verification in tests
 		memberMetricsRoute, err := initMemberAwait.SetupRouteForService(t, "member-operator-metrics-service", "/metrics")
 		require.NoError(t, err, "failed while setting up or waiting for the route to the 'member-operator-metrics' service to be available")
-		initMemberAwait.MetricsURL = memberMetricsRoute.Status.Ingress[0].Host
+		initMemberAwait.MetricsURL = "https://" + memberMetricsRoute.Status.Ingress[0].Host
 
 		// Wait for the webhooks in Member 1 only because we do not deploy webhooks for Member 2
 		// (we can't deploy the same webhook multiple times on the same cluster)

testsupport/metrics/metrics.go

@@ -13,27 +13,27 @@ import (
 	"k8s.io/client-go/rest"
 )
 
-func GetMetricValue(restConfig *rest.Config, url string, family string, expectedLabels []string) (float64, error) {
-	value, err := getMetricValue(restConfig, url, family, expectedLabels, getValue)
+func GetMetricValue(restConfig *rest.Config, baseURL string, family string, expectedLabels []string) (float64, error) {
+	value, err := getMetricValue(restConfig, baseURL, family, expectedLabels, getValue)
 	if value == nil {
 		return -1, err
 	}
 	return *value, err
 }
 
-func GetHistogramBuckets(restConfig *rest.Config, url string, family string, expectedLabels []string) ([]*dto.Bucket, error) {
-	value, err := getMetricValue(restConfig, url, family, expectedLabels, getBuckets)
+func GetHistogramBuckets(restConfig *rest.Config, baseURL string, family string, expectedLabels []string) ([]*dto.Bucket, error) {
+	value, err := getMetricValue(restConfig, baseURL, family, expectedLabels, getBuckets)
 	if value == nil {
 		return nil, err
 	}
 	return *value, err
 }
 
-func getMetricValue[T any](restConfig *rest.Config, url string, family string, expectedLabels []string, getValue func(dto.MetricType, *dto.Metric) (*T, error)) (*T, error) {
+func getMetricValue[T any](restConfig *rest.Config, baseURL string, family string, expectedLabels []string, getValue func(dto.MetricType, *dto.Metric) (*T, error)) (*T, error) {
 	if len(expectedLabels)%2 != 0 {
 		return nil, fmt.Errorf("received odd number of label arguments, labels must be key-value pairs")
 	}
-	uri := fmt.Sprintf("https://%s/metrics", url)
+	uri := baseURL + "/metrics"
 	var metrics []byte
 
 	client := http.Client{
@@ -128,8 +128,8 @@ func getBuckets(t dto.MetricType, m *dto.Metric) (*[]*dto.Bucket, error) {
 }
 
 // GetMetricLabels return all labels (indexed by key) for all metrics of the given `family`
-func GetMetricLabels(restConfig *rest.Config, url string, family string) ([]map[string]string, error) {
-	uri := fmt.Sprintf("https://%s/metrics", url)
+func GetMetricLabels(restConfig *rest.Config, baseURL string, family string) ([]map[string]string, error) {
+	uri := baseURL + "/metrics"
 	var metrics []byte
 
 	client := http.Client{