From 7b442dc0f87c9f0cfcc952420bde91ebf5334511 Mon Sep 17 00:00:00 2001 From: Stephanie Hingtgen Date: Fri, 10 May 2024 10:04:01 -0500 Subject: [PATCH] [v10.1.x] Chore: Upgrade go to 1.21.10 (#87476) * [v10.1.x] Chore: Upgrade go to 1.21.10 --------- Signed-off-by: Dave Henderson Co-authored-by: Kevin Minehart Co-authored-by: Dave Henderson Co-authored-by: Matias Chomicki --- .drone.yml | 202 +++++++++--------- .github/workflows/alerting-swagger-gen.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/pr-codeql-analysis-go.yml | 2 +- .github/workflows/publish-kinds-next.yml | 2 +- .github/workflows/publish-kinds-release.yml | 2 +- .github/workflows/verify-kinds.yml | 2 +- Dockerfile | 2 +- Makefile | 2 +- go.mod | 2 +- pkg/web/macaron.go | 3 - .../prometheus/components/PromLink.test.tsx | 2 +- scripts/drone/variables.star | 2 +- 13 files changed, 112 insertions(+), 115 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9b97b6a6300..07d7f860e79 100644 --- a/.drone.yml +++ b/.drone.yml @@ -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: @@ -321,7 +321,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.' @@ -330,21 +330,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 @@ -353,7 +353,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: @@ -404,7 +404,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 @@ -431,7 +431,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 @@ -440,11 +440,11 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.21.8-alpine + image: golang:1.21.10-alpine name: lint-backend - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.21.8-alpine + image: golang:1.21.10-alpine name: validate-modfile trigger: event: @@ -501,7 +501,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 @@ -511,7 +511,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.' @@ -520,14 +520,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 @@ -560,7 +560,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 @@ -704,7 +704,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 @@ -846,7 +846,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 @@ -860,7 +860,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.' @@ -869,14 +869,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 @@ -897,7 +897,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 @@ -918,7 +918,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 @@ -939,7 +939,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 @@ -954,7 +954,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 @@ -969,7 +969,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 @@ -986,7 +986,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: @@ -1074,7 +1074,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: @@ -1115,7 +1115,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 @@ -1223,7 +1223,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 @@ -1234,7 +1234,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.' @@ -1244,14 +1244,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 @@ -1259,7 +1259,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 @@ -1271,7 +1271,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 @@ -1282,7 +1282,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 @@ -1293,7 +1293,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: @@ -1371,7 +1371,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 @@ -1546,7 +1546,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.' @@ -1555,21 +1555,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 @@ -1578,7 +1578,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 @@ -1623,13 +1623,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 @@ -1638,11 +1638,11 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.21.8-alpine + image: golang:1.21.10-alpine name: lint-backend - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.21.8-alpine + image: golang:1.21.10-alpine name: validate-modfile - commands: - ./bin/build verify-drone @@ -1699,7 +1699,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 @@ -1709,7 +1709,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.' @@ -1718,14 +1718,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 @@ -1757,7 +1757,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 @@ -1937,7 +1937,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 @@ -2141,7 +2141,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 @@ -2155,7 +2155,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.' @@ -2164,14 +2164,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 @@ -2192,7 +2192,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 @@ -2213,7 +2213,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 @@ -2234,7 +2234,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 @@ -2249,7 +2249,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 @@ -2264,7 +2264,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 @@ -2281,7 +2281,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 @@ -2474,7 +2474,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 @@ -2571,7 +2571,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} @@ -2641,7 +2641,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 @@ -2670,7 +2670,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: @@ -2707,7 +2707,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 @@ -2814,7 +2814,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: @@ -2872,13 +2872,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: @@ -2980,7 +2980,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.' @@ -2989,21 +2989,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 @@ -3012,7 +3012,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: @@ -3069,7 +3069,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: @@ -3252,7 +3252,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: @@ -3401,7 +3401,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.' @@ -3410,21 +3410,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 @@ -3433,7 +3433,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: @@ -3488,7 +3488,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: @@ -3635,7 +3635,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: @@ -3733,20 +3733,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: @@ -3839,7 +3839,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.' @@ -3848,14 +3848,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 @@ -3876,7 +3876,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 @@ -3897,7 +3897,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 @@ -3918,7 +3918,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 @@ -3933,7 +3933,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 @@ -3948,7 +3948,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 @@ -3965,7 +3965,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: @@ -4319,7 +4319,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 @@ -4353,7 +4353,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 @@ -4607,6 +4607,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: e19fd2ac87c5d3a7ec093f6690c9c0b998b728b56fa688c1ea44564eb0646c60 +hmac: 21325b903016a38a2b8f13ce772f9644b2e8cb4e44f7b11499af665015e3cd2c ... diff --git a/.github/workflows/alerting-swagger-gen.yml b/.github/workflows/alerting-swagger-gen.yml index 3b015a0f674..a9f3a82aa50 100644 --- a/.github/workflows/alerting-swagger-gen.yml +++ b/.github/workflows/alerting-swagger-gen.yml @@ -16,7 +16,7 @@ jobs: - name: Set go version uses: actions/setup-go@v4 with: - go-version: '1.21.8' + go-version: '1.21.10' - name: Build swagger run: | make -C pkg/services/ngalert/api/tooling post.json api.json diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index b1b1e92e34a..6672ea6b99f 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -44,7 +44,7 @@ jobs: name: Set go version uses: actions/setup-go@v4 with: - go-version: '1.21.8' + go-version: '1.21.10' # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/pr-codeql-analysis-go.yml b/.github/workflows/pr-codeql-analysis-go.yml index df044097bf8..fef3ddd3217 100644 --- a/.github/workflows/pr-codeql-analysis-go.yml +++ b/.github/workflows/pr-codeql-analysis-go.yml @@ -23,7 +23,7 @@ jobs: - name: Set go version uses: actions/setup-go@v4 with: - go-version: '1.21.8' + go-version: '1.21.10' # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/publish-kinds-next.yml b/.github/workflows/publish-kinds-next.yml index 00196792787..96b40eaddb2 100644 --- a/.github/workflows/publish-kinds-next.yml +++ b/.github/workflows/publish-kinds-next.yml @@ -21,7 +21,7 @@ jobs: - name: "Setup Go" uses: "actions/setup-go@v4" with: - go-version: '1.21.8' + go-version: '1.21.10' - name: "Verify kinds" run: go run .github/workflows/scripts/kinds/verify-kinds.go diff --git a/.github/workflows/publish-kinds-release.yml b/.github/workflows/publish-kinds-release.yml index efeea2de06d..89ecd66f818 100644 --- a/.github/workflows/publish-kinds-release.yml +++ b/.github/workflows/publish-kinds-release.yml @@ -24,7 +24,7 @@ jobs: - name: "Setup Go" uses: "actions/setup-go@v4" with: - go-version: '1.21.8' + go-version: '1.21.10' - name: "Verify kinds" run: go run .github/workflows/scripts/kinds/verify-kinds.go diff --git a/.github/workflows/verify-kinds.yml b/.github/workflows/verify-kinds.yml index a5d06206628..0a0eaae584c 100644 --- a/.github/workflows/verify-kinds.yml +++ b/.github/workflows/verify-kinds.yml @@ -18,7 +18,7 @@ jobs: - name: "Setup Go" uses: "actions/setup-go@v4" with: - go-version: '1.21.8' + go-version: '1.21.10' - name: "Verify kinds" run: go run .github/workflows/scripts/kinds/verify-kinds.go diff --git a/Dockerfile b/Dockerfile index 497c0f48c43..baff760820f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/Makefile b/Makefile index 01dd1ecc49a..245f77dbac8 100644 --- a/Makefile +++ b/Makefile @@ -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) diff --git a/go.mod b/go.mod index 40a539e997e..7208ab93d6f 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana -go 1.20 +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. diff --git a/pkg/web/macaron.go b/pkg/web/macaron.go index 758b42309b5..e1aeef94bfe 100644 --- a/pkg/web/macaron.go +++ b/pkg/web/macaron.go @@ -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 diff --git a/public/app/plugins/datasource/prometheus/components/PromLink.test.tsx b/public/app/plugins/datasource/prometheus/components/PromLink.test.tsx index bb115283ada..812e11fbfdc 100644 --- a/public/app/plugins/datasource/prometheus/components/PromLink.test.tsx +++ b/public/app/plugins/datasource/prometheus/components/PromLink.test.tsx @@ -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) => { const panelData = { diff --git a/scripts/drone/variables.star b/scripts/drone/variables.star index aee8dbbba98..caf3810b755 100644 --- a/scripts/drone/variables.star +++ b/scripts/drone/variables.star @@ -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"