Fixes linter warning from the yacc file. (grafana#1328)

* Fixes linter warning from the yacc file. Signed-off-by: Cyril Tovena <[email protected]> * Improves sed to work on POSIX Signed-off-by: Cyril Tovena <[email protected]>
francismago · Nov 28, 2019 · 27f17bc · 27f17bc
1 parent eb7b495
commit 27f17bc
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 66 deletions.
diff --git a/Makefile b/Makefile
@@ -219,7 +219,7 @@ publish: dist
 ########
 
 lint:
-	GO111MODULE=on GOGC=10 golangci-lint run
+	GO111MODULE=on GOGC=10 golangci-lint run -v
 
 ########
 # Test #
@@ -262,6 +262,8 @@ ifeq ($(BUILD_IN_CONTAINER),true)
 		$(IMAGE_PREFIX)/loki-build-image:$(BUILD_IMAGE_VERSION) $@;
 else
 	goyacc -p $(basename $(notdir $<)) -o $@ $<
+	sed -i.back '/^\/\/line/ d' $@
+	rm ${@}.back
 endif
 
 #############

diff --git a/cmd/fluent-bit/loki_test.go b/cmd/fluent-bit/loki_test.go
@@ -139,7 +139,7 @@ func Test_createLine(t *testing.T) {
 				return
 			}
 			if tt.f == jsonFormat {
-				compareJson(t, got, tt.want)
+				compareJSON(t, got, tt.want)
 			} else {
 				if got != tt.want {
 					t.Errorf("createLine() = %v, want %v", got, tt.want)
@@ -151,7 +151,7 @@ func Test_createLine(t *testing.T) {
 
 // compareJson unmarshal both string to map[string]interface compare json result.
 // we can't compare string to string as jsoniter doesn't ensure field ordering.
-func compareJson(t *testing.T, got, want string) {
+func compareJSON(t *testing.T, got, want string) {
 	var w map[string]interface{}
 	err := jsoniter.Unmarshal([]byte(want), &w)
 	if err != nil {

diff --git a/pkg/chunkenc/gzip_test.go b/pkg/chunkenc/gzip_test.go
@@ -285,7 +285,9 @@ func BenchmarkHeadBlockIterator(b *testing.B) {
 			h := headBlock{}
 
 			for i := 0; i < j; i++ {
-				h.append(int64(i), "this is the append string")
+				if err := h.append(int64(i), "this is the append string"); err != nil {
+					b.Fatal(err)
+				}
 			}
 
 			b.ResetTimer()

diff --git a/pkg/loghttp/params.go b/pkg/loghttp/params.go
@@ -14,7 +14,6 @@ import (
 const (
 	defaultQueryLimit = 100
 	defaultSince      = 1 * time.Hour
-	defaultStep       = 1 // 1 seconds
 )
 
 func limit(r *http.Request) (uint32, error) {

diff --git a/pkg/logql/expr.y.go b/pkg/logql/expr.y.go
diff --git a/pkg/promtail/client/batch_test.go b/pkg/promtail/client/batch_test.go
@@ -119,8 +119,8 @@ func TestHashCollisions(t *testing.T) {
 	const entriesPerLabel = 10
 
 	for i := 0; i < entriesPerLabel; i++ {
-		b.add(entry{labels: ls1, Entry: logproto.Entry{time.Now(), fmt.Sprintf("line %d", i)}})
-		b.add(entry{labels: ls2, Entry: logproto.Entry{time.Now(), fmt.Sprintf("line %d", i)}})
+		b.add(entry{labels: ls1, Entry: logproto.Entry{Timestamp: time.Now(), Line: fmt.Sprintf("line %d", i)}})
+		b.add(entry{labels: ls2, Entry: logproto.Entry{Timestamp: time.Now(), Line: fmt.Sprintf("line %d", i)}})
 	}
 
 	// make sure that colliding labels are stored properly as independent streams