Chore: Upgrade Go to 1.19.2 (#56857)

We also need to upgrade the linter together with the Go version, all the changes should relate to either fixing linting problems or upgrading the Go version used to build Grafana.
This commit is contained in:
Emil Tullstedt
2022-10-13 14:53:51 +02:00
committed by GitHub
parent 9e70696f09
commit 656e270bd9
152 changed files with 377 additions and 347 deletions
+8 -7
View File
@@ -81,8 +81,8 @@ RUN cd /tmp && \
rm -rf /tmp/x86_64-centos6-linux-gnu/ && \
rm -rf /tmp/crosstool-ng-${CTNG}
ARG GOLANGCILINT_VERSION=1.37.1
ARG GOLANGCILINT_CHKSUM=1929425d7733d136b342395c77f171d459aa89b198933465ec4c854aa34c41a2
ARG GOLANGCILINT_VERSION=1.49.0
ARG GOLANGCILINT_CHKSUM=5badc6e9fee2003621efa07e385910d9a88c89b38f6c35aded153193c5125178
RUN curl -fLO https://github.com/golangci/golangci-lint/releases/download/v${GOLANGCILINT_VERSION}/golangci-lint-${GOLANGCILINT_VERSION}-linux-amd64.tar.gz
RUN echo ${GOLANGCILINT_CHKSUM} golangci-lint-${GOLANGCILINT_VERSION}-linux-amd64.tar.gz | sha256sum --check --strict --status
@@ -110,7 +110,7 @@ RUN rm dockerize-linux-amd64-v${DOCKERIZE_VERSION}.tar.gz
# Use old Debian (this has support into 2022) in order to ensure binary compatibility with older glibc's.
FROM debian:stretch-20210208
ENV GOVERSION=1.17.11 \
ENV GOVERSION=1.19.2 \
PATH=/usr/local/go/bin:$PATH \
GOPATH=/go \
NODEVERSION=16.14.0-1nodesource1 \
@@ -145,7 +145,8 @@ RUN apt-get update && \
ruby-dev \
rubygems \
unzip && \
gem install -N fpm && \
gem install -N public_suffix -v 4.0.7 && \
gem install --conservative -N fpm && \
ln -s /usr/bin/llvm-dsymutil-6.0 /usr/bin/dsymutil && \
curl -fsS https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
curl -O https://deb.nodesource.com/node_16.x/pool/main/n/nodejs/nodejs_${NODEVERSION}_amd64.deb &&\
@@ -183,11 +184,11 @@ RUN cd /tmp && \
tar xf x86_64-linux-musl-cross.tgz && \
rm x86_64-linux-musl-cross.tgz
RUN go get -u github.com/mgechev/revive@v1.0.2 && \
RUN go install github.com/mgechev/revive@v1.0.2 && \
mv ${GOPATH}/bin/revive /usr/local/bin/ && \
go get github.com/google/go-jsonnet/cmd/jsonnetfmt && \
go install github.com/google/go-jsonnet/cmd/jsonnetfmt@latest && \
mv ${GOPATH}/bin/jsonnetfmt /usr/local/bin/ && \
go get github.com/monitoring-mixins/mixtool/cmd/mixtool && \
go install github.com/monitoring-mixins/mixtool/cmd/mixtool@latest && \
mv ${GOPATH}/bin/mixtool /usr/local/bin/
COPY ./bootstrap.sh /tmp/bootstrap.sh
@@ -2,7 +2,7 @@ package main
import (
"fmt"
"io/ioutil"
"io/ioutil" //nolint:staticcheck // No need to change in v8.
"net/http"
"strings"
"time"
@@ -56,11 +56,13 @@ type urlGetter interface {
type getHTTPContents struct{}
func (getHTTPContents) getContents(url string) (string, error) {
//nolint:gosec
response, err := http.Get(url)
if err != nil {
return "", err
}
//nolint:errcheck
defer response.Body.Close()
all, err := ioutil.ReadAll(response.Body)
if err != nil {
+3 -2
View File
@@ -4,7 +4,7 @@ import (
"bytes"
"encoding/json"
"fmt"
"io/ioutil"
"io/ioutil" //nolint:staticcheck // No need to change in v8.
"log"
"net/http"
"strings"
@@ -252,7 +252,7 @@ func (p *publisher) postRequest(url string, obj interface{}, desc string) error
}
if p.dryRun {
log.Println(fmt.Sprintf("POST to %s:", p.apiURL(url)))
log.Printf("POST to %s:\n", p.apiURL(url))
log.Println(string(jsonBytes))
return nil
}
@@ -275,6 +275,7 @@ func (p *publisher) postRequest(url string, obj interface{}, desc string) error
}
if res.Body != nil {
//nolint:errcheck
defer res.Body.Close()
body, err := ioutil.ReadAll(res.Body)
if err != nil {
@@ -9,7 +9,6 @@ import (
)
func TestPreparingReleaseFromRemote(t *testing.T) {
cases := []struct {
version string
expectedVersion string
+1 -1
View File
@@ -1,7 +1,7 @@
load('scripts/drone/vault.star', 'from_secret', 'github_token', 'pull_secret', 'drone_token', 'prerelease_bucket')
grabpl_version = 'v2.9.50'
build_image = 'grafana/build-container:1.5.5'
build_image = 'grafana/build-container:1.5.5-go1.19.2-2'
publish_image = 'grafana/grafana-ci-deploy:1.3.1'
deploy_docker_image = 'us.gcr.io/kubernetes-dev/drone/plugins/deploy-image'
alpine_image = 'alpine:3.15'
+2 -5
View File
@@ -22,14 +22,13 @@ rules = "pkg/ruleguard.rules.go"
disable-all = true
enable = [
"bodyclose",
"deadcode",
"depguard",
"dogsled",
"errcheck",
# "gochecknoinits",
"goconst",
"gocritic",
"goimports",
# "gocritic", # broken in 1.49.0?
# "goimports", # ignored for v8.5.x to reduce size of Go 1.19.2 upgrade refactoring.
"goprintffuncname",
"gosec",
"gosimple",
@@ -40,12 +39,10 @@ enable = [
"rowserrcheck",
"exportloopref",
"staticcheck",
"structcheck",
"stylecheck",
"typecheck",
"unconvert",
"unused",
"varcheck",
"whitespace",
"gocyclo",
"exhaustive",