Fixed broken test.

Signed-off-by: Bartlomiej Plotka <[email protected]>
thanos-io · Mar 16, 2020 · 1227553 · 1227553
1 parent 2dc375b
commit 1227553
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 61 deletions.
diff --git a/pkg/rule/api/v1_test.go b/pkg/rule/api/v1_test.go
@@ -272,7 +272,7 @@ func testEndpoints(t *testing.T, api *API) {
 				testutil.Ok(t, err)
 				got, err := json.Marshal(test.response)
 				testutil.Ok(t, err)
-				testutil.Equals(t, exp, got)
+				testutil.Equals(t, string(exp), string(got))
 			})
 		}
 	}

diff --git a/pkg/store/storepb/rules.pb.go b/pkg/store/storepb/rules.pb.go
diff --git a/pkg/store/storepb/rules.proto b/pkg/store/storepb/rules.proto
@@ -98,7 +98,7 @@ message Alert {
 message RecordingRule {
   string name                               = 1 [(gogoproto.jsontag) = "name" ];
   string query                              = 2 [(gogoproto.jsontag) = "query" ];
-  PromLabels labels                         = 3 [(gogoproto.jsontag) = "labels,omitempty" ];
+  PromLabels labels                         = 3 [(gogoproto.jsontag) = "labels" ];
   string health                             = 4 [(gogoproto.jsontag) = "health" ];
   string last_error                         = 5 [(gogoproto.jsontag) = "lastError,omitempty" ];
   double evaluation_duration_seconds        = 6 [(gogoproto.jsontag) = "evaluationTime" ];

diff --git a/pkg/testutil/testpromcompatibility/api_compatibility.go b/pkg/testutil/testpromcompatibility/api_compatibility.go
@@ -64,7 +64,7 @@ type AlertingRule struct {
 type RecordingRule struct {
 	Name           string           `json:"name"`
 	Query          string           `json:"query"`
-	Labels         labels.Labels    `json:"labels,omitempty"`
+	Labels         labels.Labels    `json:"labels"`
 	Health         rules.RuleHealth `json:"health"`
 	LastError      string           `json:"lastError,omitempty"`
 	EvaluationTime float64          `json:"evaluationTime"`