fix: lint

grafana · Jun 18, 2024 · fa7016b · fa7016b
1 parent b2d72a6
commit fa7016b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/pkg/pattern/ingester_querier_test.go b/pkg/pattern/ingester_querier_test.go
@@ -256,12 +256,12 @@ func (f *fakeRing) InstancesWithTokensCount() int {
 }
 
 // InstancesInZoneCount returns the number of instances in the ring that are registered in given zone.
-func (f *fakeRing) InstancesInZoneCount(zone string) int {
+func (f *fakeRing) InstancesInZoneCount(_ string) int {
 	panic("not implemented") // TODO: Implement
 }
 
 // InstancesWithTokensInZoneCount returns the number of instances in the ring that are registered in given zone and have tokens.
-func (f *fakeRing) InstancesWithTokensInZoneCount(zone string) int {
+func (f *fakeRing) InstancesWithTokensInZoneCount(_ string) int {
 	panic("not implemented") // TODO: Implement
 }
 

diff --git a/pkg/pattern/ingester_test.go b/pkg/pattern/ingester_test.go
@@ -701,9 +701,7 @@ func TestInstancePushQuerySamples(t *testing.T) {
 				require.NoError(t, err)
 
 				ss := make([]logproto.Series, 0, len(res.Series))
-				for _, s := range res.Series {
-					ss = append(ss, s)
-				}
+				ss = append(ss, res.Series...)
 
 				sort.Slice(ss, func(i, j int) bool {
 					return ss[i].Labels < ss[j].Labels
@@ -720,9 +718,7 @@ func TestInstancePushQuerySamples(t *testing.T) {
 				require.NoError(t, err)
 
 				ss = make([]logproto.Series, 0, len(res.Series))
-				for _, s := range res.Series {
-					ss = append(ss, s)
-				}
+				ss = append(ss, res.Series...)
 
 				sort.Slice(ss, func(i, j int) bool {
 					return ss[i].Labels < ss[j].Labels

diff --git a/pkg/pattern/stream_test.go b/pkg/pattern/stream_test.go
@@ -130,6 +130,8 @@ func TestSampleIterator(t *testing.T) {
 		require.NoError(t, err)
 
 		expr, err := syntax.ParseSampleExpr("count_over_time({foo=\"bar\"}[5s])")
+		require.NoError(t, err)
+
 		it, err := stream.SampleIterator(
 			context.Background(),
 			expr,
@@ -140,6 +142,7 @@ func TestSampleIterator(t *testing.T) {
 		require.NoError(t, err)
 
 		res, err := iter.ReadAllSamples(it)
+		require.NoError(t, err)
 		require.Equal(t, 1, len(res.Series))
 		require.Equal(t, 1, len(res.Series[0].Samples))
 		require.Equal(t, float64(2), res.Series[0].Samples[0].Value)
@@ -184,6 +187,8 @@ func TestSampleIterator(t *testing.T) {
 
 		t.Run("non-overlapping timestamps", func(t *testing.T) {
 			expr, err := syntax.ParseSampleExpr("count_over_time({foo=\"bar\"}[5s])")
+			require.NoError(t, err)
+
 			it, err := stream.SampleIterator(
 				context.Background(),
 				expr,
@@ -194,6 +199,8 @@ func TestSampleIterator(t *testing.T) {
 			require.NoError(t, err)
 
 			res, err := iter.ReadAllSamples(it)
+			require.NoError(t, err)
+
 			require.Equal(t, 1, len(res.Series))
 			require.Equal(t, 2, len(res.Series[0].Samples))
 			require.Equal(t, float64(2), res.Series[0].Samples[0].Value)
@@ -202,6 +209,8 @@ func TestSampleIterator(t *testing.T) {
 
 		t.Run("overlapping timestamps", func(t *testing.T) {
 			expr, err := syntax.ParseSampleExpr("count_over_time({foo=\"bar\"}[1m])")
+			require.NoError(t, err)
+
 			it, err := stream.SampleIterator(
 				context.Background(),
 				expr,
@@ -212,6 +221,8 @@ func TestSampleIterator(t *testing.T) {
 			require.NoError(t, err)
 
 			res, err := iter.ReadAllSamples(it)
+			require.NoError(t, err)
+
 			require.Equal(t, 1, len(res.Series))
 			require.Equal(
 				t,
@@ -250,6 +261,8 @@ func TestSampleIterator(t *testing.T) {
 		require.NoError(t, err)
 
 		expr, err := syntax.ParseSampleExpr("count_over_time({foo=\"bar\"}[1s])")
+		require.NoError(t, err)
+
 		it, err := stream.SampleIterator(
 			context.Background(),
 			expr,
@@ -260,11 +273,15 @@ func TestSampleIterator(t *testing.T) {
 		require.NoError(t, err)
 
 		res, err := iter.ReadAllSamples(it)
+		require.NoError(t, err)
+
 		require.Equal(t, 1, len(res.Series))
 		require.Equal(t, 1, len(res.Series[0].Samples))
 		require.Equal(t, int64(26000000000), res.Series[0].Samples[0].Timestamp)
 
 		expr, err = syntax.ParseSampleExpr("count_over_time({foo=\"bar\"}[5s])")
+		require.NoError(t, err)
+
 		it, err = stream.SampleIterator(
 			context.Background(),
 			expr,
@@ -275,6 +292,8 @@ func TestSampleIterator(t *testing.T) {
 		require.NoError(t, err)
 
 		res, err = iter.ReadAllSamples(it)
+		require.NoError(t, err)
+
 		require.Equal(t, 1, len(res.Series))
 		require.Equal(t, 1, len(res.Series[0].Samples))
 		require.Equal(t, int64(30000000000), res.Series[0].Samples[0].Timestamp)