From df4bc66f2a46790c8352813267a8d036a8f21b97 Mon Sep 17 00:00:00 2001 From: Ben Ye Date: Tue, 23 Apr 2024 10:56:22 -0700 Subject: [PATCH] include https://github.com/cortexproject/cortex/pull/5882 to changelog Signed-off-by: Ben Ye try fixing lint Signed-off-by: Ben Ye try again Signed-off-by: Ben Ye --- .golangci.yml | 14 ++++++++++---- CHANGELOG.md | 2 +- build-image/Dockerfile | 2 +- pkg/querier/testutils.go | 5 +++-- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index c5c0da324e..77d8f8cab6 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -19,12 +19,18 @@ linters-settings: exclude: ./.errcheck-exclude goimports: local-prefixes: "github.com/cortexproject/cortex" + revive: + severity: error # We only want critical issues. depguard: - list-type: blacklist - include-go-root: true - packages-with-error-message: - - github.com/go-kit/kit/log: "Use github.com/go-kit/log instead of github.com/go-kit/kit/log" + rules: + main: + list-mode: lax + files: + - $all + deny: + - pkg: "github.com/go-kit/kit/log" + desc: Use github.com/go-kit/log instead of github.com/go-kit/kit/log" run: timeout: 5m diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f36d96775..d6b6589735 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ ## 1.16.1 2024-04-23 * [ENHANCEMENT] Upgraded Docker base images to `alpine:3.18`. #5684 -* [ENHANCEMENT] Upgrade to go 1.21.9 #5879 +* [ENHANCEMENT] Upgrade to go 1.21.9 #5879 #5882 ## 1.16.0 2023-11-20 diff --git a/build-image/Dockerfile b/build-image/Dockerfile index 8b952300d9..10a1ebbf2e 100644 --- a/build-image/Dockerfile +++ b/build-image/Dockerfile @@ -23,7 +23,7 @@ RUN GOARCH=$(go env GOARCH) && \ chmod +x shfmt && \ mv shfmt /usr/bin -RUN curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b /usr/bin v1.51.2 +RUN curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b /usr/bin v1.54.1 ENV HUGO_VERSION=v0.101.0 RUN go install github.com/client9/misspell/cmd/misspell@v0.3.4 &&\ diff --git a/pkg/querier/testutils.go b/pkg/querier/testutils.go index 650d93f727..a60e6761f5 100644 --- a/pkg/querier/testutils.go +++ b/pkg/querier/testutils.go @@ -2,16 +2,17 @@ package querier import ( "context" - "github.com/cortexproject/cortex/pkg/cortexpb" - "github.com/cortexproject/cortex/pkg/util/limiter" + "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/scrape" "github.com/stretchr/testify/mock" + "github.com/cortexproject/cortex/pkg/cortexpb" "github.com/cortexproject/cortex/pkg/ingester/client" "github.com/cortexproject/cortex/pkg/prom1/storage/metric" "github.com/cortexproject/cortex/pkg/util/flagext" + "github.com/cortexproject/cortex/pkg/util/limiter" "github.com/cortexproject/cortex/pkg/util/validation" )