fix tests

Author: chrroberts-pure

internal/openmetrics-exporter/volume_groups_collector_test.go

@@ -12,7 +12,7 @@ import (
 	"testing"
 )
 
-func TestVolumesSpaceCollector(t *testing.T) {
+func TestVolumesGroupSpaceCollector(t *testing.T) {
 	res, _ := os.ReadFile("../../test/data/volume_groups.json")
 	vers, _ := os.ReadFile("../../test/data/versions.json")
 	var volumeGroups client.VolumeGroupsList
@@ -34,14 +34,14 @@ func TestVolumesSpaceCollector(t *testing.T) {
 	want := make(map[string]bool)
 	for _, vg := range volumeGroups.Items {
 		if vg.QoS.BandwidthLimit != nil {
-			want[fmt.Sprintf("label:{name:\"name\" value:\"%s\"} gauge:{value:%g}", vg.Name, float64(*v.QoS.BandwidthLimit))] = true
+			want[fmt.Sprintf("label:{name:\"name\" value:\"%s\"} gauge:{value:%g}", vg.Name, float64(*vg.QoS.BandwidthLimit))] = true
 		}
 		if vg.QoS.IopsLimit != nil {
-			want[fmt.Sprintf("label:{name:\"name\" value:\"%s\"} gauge:{value:%g}", vg.Name, float64(*v.QoS.IopsLimit))] = true
+			want[fmt.Sprintf("label:{name:\"name\" value:\"%s\"} gauge:{value:%g}", vg.Name, float64(*vg.QoS.IopsLimit))] = true
 		}
 	}
 	defer server.Close()
-	c := client.NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", "test-X-Request-Id-string", false)
+	c := client.NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", "test-X-Request-Id-string", false, false)
 	vgc := NewVolumeGroupsCollector(c)
 	metricsCheck(t, vgc, want)
 }

internal/openmetrics-exporter/volume_groups_performance_collector_test.go

@@ -13,7 +13,7 @@ import (
 	client "purestorage/fa-openmetrics-exporter/internal/rest-client"
 )
 
-func TestVolumesPerformanceCollector(t *testing.T) {
+func TestVolumesGroupPerformanceCollector(t *testing.T) {
 	ref, _ := os.ReadFile("../../test/data/volume_groups_performance.json")
 	vers, _ := os.ReadFile("../../test/data/versions.json")
 	var volumegroupsperf client.VolumeGroupsPerformanceList
@@ -24,10 +24,10 @@ func TestVolumesPerformanceCollector(t *testing.T) {
 			w.Header().Set("Content-Type", "application/json")
 			w.WriteHeader(http.StatusOK)
 			w.Write([]byte(vers))
-		} else if vperfu.MatchString(r.URL.Path) {
+		} else if vgperfu.MatchString(r.URL.Path) {
 			w.Header().Set("Content-Type", "application/json")
 			w.WriteHeader(http.StatusOK)
-			w.Write([]byte(volsperf))
+			w.Write([]byte(ref))
 		}
 	}))
 	endp := strings.Split(server.URL, "/")
@@ -62,8 +62,8 @@ func TestVolumesPerformanceCollector(t *testing.T) {
 		want[fmt.Sprintf("label:{name:\"dimension\" value:\"bytes_per_read\"} label:{name:\"name\" value:\"%s\"} gauge:{value:%g}", p.Name, p.BytesPerRead)] = true
 		want[fmt.Sprintf("label:{name:\"dimension\" value:\"bytes_per_write\"} label:{name:\"name\" value:\"%s\"} gauge:{value:%g}", p.Name, p.BytesPerWrite)] = true
 	}
-	c := client.NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", "test-X-Request-Id-string", false)
+	c := client.NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", "test-X-Request-Id-string", false, false)
 
-	vgpc := NewVolumeGroupsPerformanceCollector(c, vl)
+	vgpc := NewVolumeGroupsPerformanceCollector(c)
 	metricsCheck(t, vgpc, want)
 }

internal/rest-client/volume_groups_performance_test.go

@@ -34,7 +34,7 @@ func TestVolumeGroupsPerformance(t *testing.T) {
 	e := endp[len(endp)-1]
 	t.Run("volume_groups_performance_1", func(t *testing.T) {
 		defer server.Close()
-		c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", "test-X-Request-Id-string", false)
+		c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", "test-X-Request-Id-string", false, false)
 		vgpl := c.GetVolumeGroupsPerformance()
 		if diff := cmp.Diff(vgpl.Items, vgroupsp.Items); diff != "" {
 			t.Errorf("Mismatch (-want +got):\n%s", diff)

internal/rest-client/volume_groups_test.go

@@ -34,7 +34,7 @@ func TestVolumeGroups(t *testing.T) {
 	e := endp[len(endp)-1]
 	t.Run("volume_group_1", func(t *testing.T) {
 		defer server.Close()
-		c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", "test-X-Request-Id-string", false)
+		c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", "test-X-Request-Id-string", false, false)
 		vgl := c.GetVolumeGroups()
 		if diff := cmp.Diff(vgl.Items, vgs.Items); diff != "" {
 			t.Errorf("Mismatch (-want +got):\n%s", diff)