[v9.5.x] Chore: Upgrade go to 1.21.10 (#87478)

* [v9.5.x] Chore: Upgrade go to 1.21.10

---------

Signed-off-by: Dave Henderson <dave.henderson@grafana.com>
Co-authored-by: Kevin Minehart <kmineh0151@gmail.com>
Co-authored-by: Dave Henderson <dave.henderson@grafana.com>
Co-authored-by: Matias Chomicki <matyax@gmail.com>
This commit is contained in:
Stephanie Hingtgen
2024-05-10 18:06:49 +03:00
committed by GitHub
co-authored by Kevin Minehart Dave Henderson Matias Chomicki
parent 445da1739f
commit 6f9e03e051
12 changed files with 114 additions and 109 deletions
+99 -99
View File
@@ -25,7 +25,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: compile-build-cmd
- commands:
- ./bin/build verify-drone
@@ -76,14 +76,14 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: compile-build-cmd
- commands:
- go install github.com/bazelbuild/buildtools/buildifier@latest
- buildifier --lint=warn -mode=check -r .
depends_on:
- compile-build-cmd
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: lint-starlark
trigger:
event:
@@ -306,7 +306,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -315,21 +315,21 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: wire-install
- commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang
- go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
depends_on:
- wire-install
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: test-backend
- commands:
- apk add --update build-base
@@ -338,7 +338,7 @@ steps:
| grep -o '\(.*\)/' | sort -u)
depends_on:
- wire-install
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: test-backend-integration
trigger:
event:
@@ -389,7 +389,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: compile-build-cmd
- commands:
- apk add --update curl jq bash
@@ -416,7 +416,7 @@ steps:
- apk add --update make
- make gen-go
depends_on: []
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: wire-install
- commands:
- apk add --update make build-base
@@ -425,7 +425,7 @@ steps:
- wire-install
environment:
CGO_ENABLED: "1"
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: lint-backend
trigger:
event:
@@ -482,7 +482,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@@ -492,7 +492,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -501,14 +501,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: wire-install
- commands:
- yarn install --immutable
@@ -541,7 +541,7 @@ steps:
from_secret: drone_token
- commands:
- /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64
-a targz:grafana:linux/arm/v7 --go-version=1.21.8 --yarn-cache=$$YARN_CACHE_FOLDER
-a targz:grafana:linux/arm/v7 --go-version=1.21.10 --yarn-cache=$$YARN_CACHE_FOLDER
--build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt
depends_on:
- yarn-install
@@ -685,7 +685,7 @@ steps:
- docker run --privileged --rm tonistiigi/binfmt --install all
- /src/grafana-build artifacts -a docker:grafana:linux/amd64 -a docker:grafana:linux/amd64:ubuntu
-a docker:grafana:linux/arm64 -a docker:grafana:linux/arm64:ubuntu --yarn-cache=$$YARN_CACHE_FOLDER
--build-id=$$DRONE_BUILD_NUMBER --go-version=1.21.8 --ubuntu-base=ubuntu:22.04
--build-id=$$DRONE_BUILD_NUMBER --go-version=1.21.10 --ubuntu-base=ubuntu:22.04
--alpine-base=alpine:3.19.1 --tag-format='{{ .version_base }}-{{ .buildID }}-{{
.arch }}' --grafana-dir=$$PWD --ubuntu-tag-format='{{ .version_base }}-{{ .buildID
}}-ubuntu-{{ .arch }}' > docker.txt
@@ -827,7 +827,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: compile-build-cmd
- commands:
- echo $DRONE_RUNNER_NAME
@@ -841,7 +841,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -850,14 +850,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: wire-install
- commands:
- dockerize -wait tcp://postgres:5432 -timeout 120s
@@ -878,7 +878,7 @@ steps:
GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest
POSTGRES_HOST: postgres
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: postgres-integration-tests
- commands:
- dockerize -wait tcp://mysql57:3306 -timeout 120s
@@ -899,7 +899,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: mysql-5.7-integration-tests
- commands:
- dockerize -wait tcp://mysql80:3306 -timeout 120s
@@ -920,7 +920,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: mysql-8.0-integration-tests
- commands:
- dockerize -wait tcp://redis:6379 -timeout 120s
@@ -935,7 +935,7 @@ steps:
- wait-for-redis
environment:
REDIS_URL: redis://redis:6379/0
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: redis-integration-tests
- commands:
- dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -950,7 +950,7 @@ steps:
- wait-for-memcached
environment:
MEMCACHED_HOSTS: memcached:11211
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: memcached-integration-tests
- commands:
- dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@@ -967,7 +967,7 @@ steps:
AM_PASSWORD: test
AM_TENANT_ID: test
AM_URL: http://mimir_backend:8080
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: remote-alertmanager-integration-tests
trigger:
event:
@@ -1054,7 +1054,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: verify-gen-cue
trigger:
event:
@@ -1095,7 +1095,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: compile-build-cmd
- commands:
- apt-get update -yq && apt-get install shellcheck
@@ -1203,7 +1203,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@@ -1214,7 +1214,7 @@ steps:
- CODEGEN_VERIFY=1 make gen-cue
depends_on:
- clone-enterprise
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -1224,14 +1224,14 @@ steps:
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on:
- clone-enterprise
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: wire-install
- commands:
- apk add --update build-base
@@ -1239,7 +1239,7 @@ steps:
- go test -v -run=^$ -benchmem -timeout=1h -count=8 -bench=. ${GO_PACKAGES}
depends_on:
- wire-install
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: sqlite-benchmark-integration-tests
- commands:
- apk add --update build-base
@@ -1251,7 +1251,7 @@ steps:
GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest
POSTGRES_HOST: postgres
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: postgres-benchmark-integration-tests
- commands:
- apk add --update build-base
@@ -1262,7 +1262,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: mysql-5.7-benchmark-integration-tests
- commands:
- apk add --update build-base
@@ -1273,7 +1273,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: mysql-8.0-benchmark-integration-tests
trigger:
event:
@@ -1350,7 +1350,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: verify-gen-cue
trigger:
branch: main
@@ -1510,7 +1510,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -1519,21 +1519,21 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: wire-install
- commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang
- go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
depends_on:
- wire-install
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: test-backend
- commands:
- apk add --update build-base
@@ -1542,7 +1542,7 @@ steps:
| grep -o '\(.*\)/' | sort -u)
depends_on:
- wire-install
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: test-backend-integration
trigger:
branch: main
@@ -1587,13 +1587,13 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: compile-build-cmd
- commands:
- apk add --update make
- make gen-go
depends_on: []
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: wire-install
- commands:
- apk add --update make build-base
@@ -1602,7 +1602,7 @@ steps:
- wire-install
environment:
CGO_ENABLED: "1"
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: lint-backend
- commands:
- ./bin/build verify-drone
@@ -1659,7 +1659,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@@ -1669,7 +1669,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -1678,14 +1678,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: wire-install
- commands:
- yarn install --immutable
@@ -1717,7 +1717,7 @@ steps:
name: build-frontend-packages
- commands:
- /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64
-a targz:grafana:linux/arm/v7 --go-version=1.21.8 --yarn-cache=$$YARN_CACHE_FOLDER
-a targz:grafana:linux/arm/v7 --go-version=1.21.10 --yarn-cache=$$YARN_CACHE_FOLDER
--build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt
depends_on:
- update-package-json-version
@@ -1897,7 +1897,7 @@ steps:
- docker run --privileged --rm tonistiigi/binfmt --install all
- /src/grafana-build artifacts -a docker:grafana:linux/amd64 -a docker:grafana:linux/amd64:ubuntu
-a docker:grafana:linux/arm64 -a docker:grafana:linux/arm64:ubuntu --yarn-cache=$$YARN_CACHE_FOLDER
--build-id=$$DRONE_BUILD_NUMBER --go-version=1.21.8 --ubuntu-base=ubuntu:22.04
--build-id=$$DRONE_BUILD_NUMBER --go-version=1.21.10 --ubuntu-base=ubuntu:22.04
--alpine-base=alpine:3.19.1 --tag-format='{{ .version_base }}-{{ .buildID }}-{{
.arch }}' --grafana-dir=$$PWD --ubuntu-tag-format='{{ .version_base }}-{{ .buildID
}}-ubuntu-{{ .arch }}' > docker.txt
@@ -2101,7 +2101,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: compile-build-cmd
- commands:
- echo $DRONE_RUNNER_NAME
@@ -2115,7 +2115,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -2124,14 +2124,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: wire-install
- commands:
- dockerize -wait tcp://postgres:5432 -timeout 120s
@@ -2152,7 +2152,7 @@ steps:
GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest
POSTGRES_HOST: postgres
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: postgres-integration-tests
- commands:
- dockerize -wait tcp://mysql57:3306 -timeout 120s
@@ -2173,7 +2173,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: mysql-5.7-integration-tests
- commands:
- dockerize -wait tcp://mysql80:3306 -timeout 120s
@@ -2194,7 +2194,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: mysql-8.0-integration-tests
- commands:
- dockerize -wait tcp://redis:6379 -timeout 120s
@@ -2209,7 +2209,7 @@ steps:
- wait-for-redis
environment:
REDIS_URL: redis://redis:6379/0
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: redis-integration-tests
- commands:
- dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -2224,7 +2224,7 @@ steps:
- wait-for-memcached
environment:
MEMCACHED_HOSTS: memcached:11211
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: memcached-integration-tests
- commands:
- dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@@ -2241,7 +2241,7 @@ steps:
AM_PASSWORD: test
AM_TENANT_ID: test
AM_URL: http://mimir_backend:8080
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: remote-alertmanager-integration-tests
trigger:
branch: main
@@ -2434,7 +2434,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: compile-build-cmd
- commands:
- ./bin/build artifacts docker fetch --edition oss
@@ -2531,7 +2531,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: compile-build-cmd
- commands:
- ./bin/build artifacts packages --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET}
@@ -2601,7 +2601,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: compile-build-cmd
- commands:
- yarn install --immutable
@@ -2630,7 +2630,7 @@ steps:
NPM_TOKEN:
from_secret: npm_token
failure: ignore
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: release-npm-packages
trigger:
event:
@@ -2667,7 +2667,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: compile-build-cmd
- depends_on:
- compile-build-cmd
@@ -2774,7 +2774,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.21.8
GO_VERSION: 1.21.10
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@@ -2832,13 +2832,13 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: compile-build-cmd
- commands:
- ./bin/build whatsnew-checker
depends_on:
- compile-build-cmd
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: whats-new-checker
trigger:
event:
@@ -2940,7 +2940,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -2949,21 +2949,21 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: wire-install
- commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang
- go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
depends_on:
- wire-install
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: test-backend
- commands:
- apk add --update build-base
@@ -2972,7 +2972,7 @@ steps:
| grep -o '\(.*\)/' | sort -u)
depends_on:
- wire-install
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: test-backend-integration
trigger:
event:
@@ -3029,7 +3029,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.21.8
GO_VERSION: 1.21.10
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@@ -3212,7 +3212,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.21.8
GO_VERSION: 1.21.10
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@@ -3361,7 +3361,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -3370,21 +3370,21 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: wire-install
- commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang
- go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
depends_on:
- wire-install
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: test-backend
- commands:
- apk add --update build-base
@@ -3393,7 +3393,7 @@ steps:
| grep -o '\(.*\)/' | sort -u)
depends_on:
- wire-install
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: test-backend-integration
trigger:
cron:
@@ -3448,7 +3448,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.21.8
GO_VERSION: 1.21.10
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@@ -3595,7 +3595,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.21.8
GO_VERSION: 1.21.10
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@@ -3693,20 +3693,20 @@ steps:
- commands: []
depends_on:
- clone
image: golang:1.21.8-windowsservercore-1809
image: golang:1.21.10-windowsservercore-1809
name: windows-init
- commands:
- go install github.com/google/wire/cmd/wire@v0.5.0
- wire gen -tags oss ./pkg/server
depends_on:
- windows-init
image: golang:1.21.8-windowsservercore-1809
image: golang:1.21.10-windowsservercore-1809
name: wire-install
- commands:
- go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
depends_on:
- wire-install
image: golang:1.21.8-windowsservercore-1809
image: golang:1.21.10-windowsservercore-1809
name: test-backend
trigger:
event:
@@ -3799,7 +3799,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -3808,14 +3808,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: wire-install
- commands:
- dockerize -wait tcp://postgres:5432 -timeout 120s
@@ -3836,7 +3836,7 @@ steps:
GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest
POSTGRES_HOST: postgres
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: postgres-integration-tests
- commands:
- dockerize -wait tcp://mysql57:3306 -timeout 120s
@@ -3857,7 +3857,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: mysql-5.7-integration-tests
- commands:
- dockerize -wait tcp://mysql80:3306 -timeout 120s
@@ -3878,7 +3878,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: mysql-8.0-integration-tests
- commands:
- dockerize -wait tcp://redis:6379 -timeout 120s
@@ -3893,7 +3893,7 @@ steps:
- wait-for-redis
environment:
REDIS_URL: redis://redis:6379/0
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: redis-integration-tests
- commands:
- dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -3908,7 +3908,7 @@ steps:
- wait-for-memcached
environment:
MEMCACHED_HOSTS: memcached:11211
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: memcached-integration-tests
- commands:
- dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@@ -3925,7 +3925,7 @@ steps:
AM_PASSWORD: test
AM_TENANT_ID: test
AM_URL: http://mimir_backend:8080
image: golang:1.21.8-alpine
image: golang:1.21.10-alpine
name: remote-alertmanager-integration-tests
trigger:
event:
@@ -4279,7 +4279,7 @@ steps:
path: /root/.docker/
- commands:
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine/git:2.40.1
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.21.8-alpine
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.21.10-alpine
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:18.12.0-alpine
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM google/cloud-sdk:431.0.0
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/grafana-ci-deploy:1.3.3
@@ -4313,7 +4313,7 @@ steps:
path: /root/.docker/
- commands:
- trivy --exit-code 1 --severity HIGH,CRITICAL alpine/git:2.40.1
- trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.21.8-alpine
- trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.21.10-alpine
- trivy --exit-code 1 --severity HIGH,CRITICAL node:18.12.0-alpine
- trivy --exit-code 1 --severity HIGH,CRITICAL google/cloud-sdk:431.0.0
- trivy --exit-code 1 --severity HIGH,CRITICAL grafana/grafana-ci-deploy:1.3.3
@@ -4567,6 +4567,6 @@ kind: secret
name: gcr_credentials
---
kind: signature
hmac: 33e19b12cb2b08c07824c502d629795cca07f99bcc23c3e999b13f9cc926c484
hmac: 52ad60a7e26b5c1361a45bb17e1b8e66a0be18646f7de92ff22b237316edc4d6
...
+1 -1
View File
@@ -44,7 +44,7 @@ jobs:
name: Set go version
uses: actions/setup-go@v3
with:
go-version: '1.21.8'
go-version: '1.21.10'
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
+1 -1
View File
@@ -23,7 +23,7 @@ jobs:
- name: Set go version
uses: actions/setup-go@v3
with:
go-version: '1.21.8'
go-version: '1.21.10'
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
+1 -1
View File
@@ -3,7 +3,7 @@
ARG BASE_IMAGE=alpine:3.19.1
ARG JS_IMAGE=node:18-alpine
ARG JS_PLATFORM=linux/amd64
ARG GO_IMAGE=golang:1.21.8-alpine
ARG GO_IMAGE=golang:1.21.10-alpine
ARG GO_SRC=go-builder
ARG JS_SRC=js-builder
+1 -1
View File
@@ -245,7 +245,7 @@ build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development.
--build-arg COMMIT_SHA=$$(git rev-parse HEAD) \
--build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \
--build-arg BASE_IMAGE=ubuntu:22.04 \
--build-arg GO_IMAGE=golang:1.21.8 \
--build-arg GO_IMAGE=golang:1.21.10 \
--tag grafana/grafana$(TAG_SUFFIX):dev-ubuntu \
$(DOCKER_BUILD_ARGS)
+1 -1
View File
@@ -1,6 +1,6 @@
module github.com/grafana/grafana
go 1.19
go 1.21.10
// Override xorm's outdated go-mssqldb dependency, since we can't upgrade to current xorm (due to breaking changes).
// We need a more current go-mssqldb so we get rid of a version of apache/thrift with vulnerabilities.
+1
View File
@@ -127,6 +127,7 @@ func TestRetryingOnFailures(t *testing.T) {
require.NoError(t, err)
})
require.NoError(t, err)
require.NoError(t, rows.Err())
require.True(t, rows.Next()) // first row
str1 := ""
@@ -39,6 +39,7 @@ func updateFolderTree(ctx context.Context, tx *session.SessionTx, tenant int64)
}
all := []*folderInfo{}
//nolint:rowserrcheck
rows, err := tx.Query(ctx, "SELECT uid,folder,name,slug FROM entity WHERE kind=? AND tenant_id=? ORDER BY slug asc;",
entity.StandardKindFolder, tenant)
if err != nil {
@@ -172,6 +172,7 @@ func (s *sqlEntityServer) readFromHistory(ctx context.Context, r *entity.ReadEnt
"updated_at", "updated_by",
}
//nolint:rowserrcheck
rows, err := s.sess.Query(ctx,
"SELECT "+strings.Join(fields, ",")+
" FROM entity_history WHERE grn=? AND version=?", oid, r.Version)
@@ -473,6 +474,7 @@ func (s *sqlEntityServer) fillCreationInfo(ctx context.Context, tx *session.Sess
createdBy = &ignore
}
//nolint:rowserrcheck
rows, err := tx.Query(ctx, "SELECT created_at,created_by FROM entity WHERE grn=?", grn)
if err != nil {
return err
@@ -494,6 +496,8 @@ func (s *sqlEntityServer) selectForUpdate(ctx context.Context, tx *session.Sessi
if false { // TODO, MYSQL/PosgreSQL can lock the row " FOR UPDATE"
q += " FOR UPDATE"
}
//nolint:rowserrcheck
rows, err := tx.Query(ctx, q, grn)
if err != nil {
return nil, err
@@ -695,6 +699,7 @@ func (s *sqlEntityServer) History(ctx context.Context, r *entity.EntityHistoryRe
" WHERE grn=? " + page + "\n" +
" ORDER BY updated_at DESC LIMIT 100"
//nolint:rowserrcheck
rows, err := s.sess.Query(ctx, query, args...)
if err != nil {
return nil, err
@@ -780,6 +785,7 @@ func (s *sqlEntityServer) Search(ctx context.Context, r *entity.EntitySearchRequ
query, args := entityQuery.toQuery()
//nolint:rowserrcheck
rows, err := s.sess.Query(ctx, query, args...)
if err != nil {
return nil, err
-3
View File
@@ -1,6 +1,3 @@
//go:build go1.3
// +build go1.3
// Copyright 2014 The Macaron Authors
//
// Licensed under the Apache License, Version 2.0 (the "License"): you may
@@ -17,7 +17,7 @@ jest.mock('@grafana/data', () => ({
const now = dateTime().valueOf();
const intervalInSeconds = 60 * 5;
const endInput = encodeURIComponent(dateTime(now).add(5, 'hours').format('Y-MM-DD HH:mm'));
const endInput = encodeURIComponent(dateTime(now).utc().format('Y-MM-DD HH:mm'));
const getPanelData = (panelDataOverrides?: Partial<PanelData>) => {
const panelData = {
+1 -1
View File
@@ -3,7 +3,7 @@ global variables
"""
grabpl_version = "v3.0.50"
golang_version = "1.21.8"
golang_version = "1.21.10"
# nodejs_version should match what's in ".nvmrc", but without the v prefix.
nodejs_version = "18.12.0"