From b6ce3826b4663098c69a4b5381cc77b9456b239c Mon Sep 17 00:00:00 2001
From: Christian Haudum <christian.haudum@gmail.com>
Date: Fri, 22 Apr 2022 16:12:30 +0200
Subject: [PATCH] Use new build image 0.20.3 (#5904)

---
 .drone/drone.yml                       | 18 +++++++++---------
 .golangci.yml                          |  2 +-
 Makefile                               |  2 +-
 pkg/ingester/ingester.go               |  2 +-
 pkg/storage/stores/tsdb/index/index.go |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.drone/drone.yml b/.drone/drone.yml
index 028aab3f011a5..5629fb999255b 100644
--- a/.drone/drone.yml
+++ b/.drone/drone.yml
@@ -40,27 +40,27 @@ steps:
   - make BUILD_IN_CONTAINER=false check-drone-drift
   depends_on:
   - clone
-  image: grafana/loki-build-image:0.20.1
+  image: grafana/loki-build-image:0.20.3
   name: check-drone-drift
 - commands:
   - make BUILD_IN_CONTAINER=false check-generated-files
   depends_on:
   - clone
-  image: grafana/loki-build-image:0.20.1
+  image: grafana/loki-build-image:0.20.3
   name: check-generated-files
 - commands:
   - make BUILD_IN_CONTAINER=false test
   depends_on:
   - clone
   - check-generated-files
-  image: grafana/loki-build-image:0.20.1
+  image: grafana/loki-build-image:0.20.3
   name: test
 - commands:
   - make BUILD_IN_CONTAINER=false lint
   depends_on:
   - clone
   - check-generated-files
-  image: grafana/loki-build-image:0.20.1
+  image: grafana/loki-build-image:0.20.3
   name: lint
 - commands:
   - make BUILD_IN_CONTAINER=false check-mod
@@ -68,7 +68,7 @@ steps:
   - clone
   - test
   - lint
-  image: grafana/loki-build-image:0.20.1
+  image: grafana/loki-build-image:0.20.3
   name: check-mod
 - commands:
   - apk add make bash && make lint-scripts
@@ -79,19 +79,19 @@ steps:
   depends_on:
   - clone
   - check-generated-files
-  image: grafana/loki-build-image:0.20.1
+  image: grafana/loki-build-image:0.20.3
   name: loki
 - commands:
   - make BUILD_IN_CONTAINER=false validate-example-configs
   depends_on:
   - loki
-  image: grafana/loki-build-image:0.20.1
+  image: grafana/loki-build-image:0.20.3
   name: validate-example-configs
 - commands:
   - make BUILD_IN_CONTAINER=false check-example-config-doc
   depends_on:
   - clone
-  image: grafana/loki-build-image:0.20.1
+  image: grafana/loki-build-image:0.20.3
   name: check-example-config-doc
 trigger:
   event:
@@ -1118,6 +1118,6 @@ kind: secret
 name: deploy_config
 ---
 kind: signature
-hmac: 64871d70248fbe43acab816fe107dc657442ded224b48779ac15f4559143a2c6
+hmac: 6e2865a871f73b7bec7caad285b3999bfdab4e85e29606061663f4c9160cc35c
 
 ...
diff --git a/.golangci.yml b/.golangci.yml
index b7ef2ca712a41..a9b535c2504d0 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -16,7 +16,7 @@ run:
   tests: true
 
   # list of build tags, all linters use it. Default is empty list.
-  build-tags:
+  build-tags: []
 
   # which dirs to skip: they won't be analyzed;
   # can use regexp here: generated.*, regexp is applied on full path;
diff --git a/Makefile b/Makefile
index 31b3ca51870f8..7b17411cff567 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ DOCKER_IMAGE_DIRS := $(patsubst %/Dockerfile,%,$(DOCKERFILES))
 BUILD_IN_CONTAINER ?= true
 
 # ensure you run `make drone` after changing this
-BUILD_IMAGE_VERSION := 0.20.1
+BUILD_IMAGE_VERSION := 0.20.3
 
 # Docker image info
 IMAGE_PREFIX ?= grafana
diff --git a/pkg/ingester/ingester.go b/pkg/ingester/ingester.go
index 70aca05764fe8..e12b9548bffb9 100644
--- a/pkg/ingester/ingester.go
+++ b/pkg/ingester/ingester.go
@@ -551,7 +551,7 @@ func (i *Ingester) Push(ctx context.Context, req *logproto.PushRequest) (*logpro
 	return &logproto.PushResponse{}, err
 }
 
-func (i *Ingester) GetOrCreateInstance(instanceID string) *instance {
+func (i *Ingester) GetOrCreateInstance(instanceID string) *instance { //nolint:revive
 	inst, ok := i.getInstanceByID(instanceID)
 	if ok {
 		return inst
diff --git a/pkg/storage/stores/tsdb/index/index.go b/pkg/storage/stores/tsdb/index/index.go
index 0d34f96aaf95a..af69a5b64a126 100644
--- a/pkg/storage/stores/tsdb/index/index.go
+++ b/pkg/storage/stores/tsdb/index/index.go
@@ -1307,7 +1307,7 @@ func newReader(b ByteSlice, c io.Closer) (*Reader, error) {
 		r.nameSymbols[off] = k
 	}
 
-	r.fingerprintOffsets, err = ReadFingerprintOffsetsTable(r.b, r.toc.FingerprintOffsets)
+	r.fingerprintOffsets, err = readFingerprintOffsetsTable(r.b, r.toc.FingerprintOffsets)
 	if err != nil {
 		return nil, errors.Wrap(err, "loading fingerprint offsets")
 	}
@@ -1522,7 +1522,7 @@ func ReadOffsetTable(bs ByteSlice, off uint64, f func([]string, uint64, int) err
 	return d.Err()
 }
 
-func ReadFingerprintOffsetsTable(bs ByteSlice, off uint64) (FingerprintOffsets, error) {
+func readFingerprintOffsetsTable(bs ByteSlice, off uint64) (FingerprintOffsets, error) {
 	d := encoding.DecWrap(tsdb_enc.NewDecbufAt(bs, int(off), castagnoliTable))
 	cnt := d.Be32()
 	res := make(FingerprintOffsets, 0, int(cnt))