From a08f4067813f850a396474e85c4d2fd23b98c345 Mon Sep 17 00:00:00 2001 From: Mariell Hoversholm Date: Fri, 17 Jan 2025 09:29:52 +0100 Subject: [PATCH] Security: Update to Go 1.23.5 (#99121) * feat: update to Go 1.23.5 * chore: make drone * chore: make update-workspace * CI: Force re-build * CI: Force re-build --- .drone.yml | 210 ++++++++++++++-------------- Dockerfile | 2 +- Makefile | 2 +- apps/alerting/notifications/go.mod | 2 +- go.mod | 2 +- go.work | 2 +- pkg/storage/unified/apistore/go.mod | 2 +- pkg/storage/unified/resource/go.mod | 2 +- scripts/drone/variables.star | 2 +- 9 files changed, 113 insertions(+), 113 deletions(-) diff --git a/.drone.yml b/.drone.yml index 6c5961a92d4..f81d8bbbc69 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,7 +25,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: compile-build-cmd - commands: - ./bin/build verify-drone @@ -75,7 +75,7 @@ steps: - go install github.com/bazelbuild/buildtools/buildifier@latest - buildifier --lint=warn -mode=check -r . depends_on: [] - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: lint-starlark trigger: event: @@ -427,7 +427,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -436,21 +436,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang - go list -f '{{.Dir}}/...' -m | xargs go test -short -covermode=atomic -timeout=5m depends_on: - wire-install - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: test-backend - commands: - apk add --update build-base @@ -459,7 +459,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: test-backend-integration trigger: event: @@ -513,7 +513,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: compile-build-cmd - commands: - echo $(/usr/bin/github-app-external-token) > /github-app/token @@ -558,16 +558,16 @@ steps: - apk add --update make - make gen-go depends_on: [] - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: wire-install - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: validate-openapi-spec trigger: event: @@ -643,7 +643,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -653,7 +653,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -662,7 +662,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: verify-gen-jsonnet - commands: - yarn install --immutable || yarn install --immutable @@ -698,7 +698,7 @@ steps: - /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64 -a targz:grafana:linux/arm/v7 -a docker:grafana:linux/amd64 -a docker:grafana:linux/amd64:ubuntu -a docker:grafana:linux/arm64 -a docker:grafana:linux/arm64:ubuntu -a docker:grafana:linux/arm/v7 - -a docker:grafana:linux/arm/v7:ubuntu --go-version=1.23.4 --yarn-cache=$$YARN_CACHE_FOLDER + -a docker:grafana:linux/arm/v7:ubuntu --go-version=1.23.5 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.20.3 --tag-format='{{ .version_base }}-{{ .buildID }}-{{ .arch }}' --ubuntu-tag-format='{{ .version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' --verify='false' --grafana-dir=$$PWD @@ -1096,7 +1096,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -1110,7 +1110,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1119,14 +1119,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -1147,7 +1147,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -1168,7 +1168,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -1184,7 +1184,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -1200,7 +1200,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -1216,7 +1216,7 @@ steps: environment: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: remote-alertmanager-integration-tests trigger: event: @@ -1298,7 +1298,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: verify-gen-cue trigger: event: @@ -1419,7 +1419,7 @@ steps: && return 1; fi depends_on: - clone-enterprise - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: swagger-gen trigger: event: @@ -1524,7 +1524,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1535,7 +1535,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - clone-enterprise - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1545,14 +1545,14 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - clone-enterprise - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: wire-install - commands: - apk add --update build-base @@ -1560,7 +1560,7 @@ steps: - go test -v -run=^$ -benchmem -timeout=1h -count=8 -bench=. ${GO_PACKAGES} depends_on: - wire-install - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: sqlite-benchmark-integration-tests - commands: - apk add --update build-base @@ -1572,7 +1572,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: postgres-benchmark-integration-tests - commands: - apk add --update build-base @@ -1583,7 +1583,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: mysql-8.0-benchmark-integration-tests trigger: event: @@ -1655,7 +1655,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: verify-gen-cue trigger: branch: main @@ -1828,7 +1828,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1837,21 +1837,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang - go list -f '{{.Dir}}/...' -m | xargs go test -short -covermode=atomic -timeout=5m depends_on: - wire-install - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: test-backend - commands: - apk add --update build-base @@ -1860,7 +1860,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: test-backend-integration trigger: branch: main @@ -1905,22 +1905,22 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: compile-build-cmd - commands: - apk add --update make - make gen-go depends_on: [] - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: wire-install - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: validate-openapi-spec - commands: - ./bin/build verify-drone @@ -2052,7 +2052,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2062,7 +2062,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2071,7 +2071,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: verify-gen-jsonnet - commands: - yarn install --immutable || yarn install --immutable @@ -2106,7 +2106,7 @@ steps: - /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64 -a targz:grafana:linux/arm/v7 -a docker:grafana:linux/amd64 -a docker:grafana:linux/amd64:ubuntu -a docker:grafana:linux/arm64 -a docker:grafana:linux/arm64:ubuntu -a docker:grafana:linux/arm/v7 - -a docker:grafana:linux/arm/v7:ubuntu --go-version=1.23.4 --yarn-cache=$$YARN_CACHE_FOLDER + -a docker:grafana:linux/arm/v7:ubuntu --go-version=1.23.5 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.20.3 --tag-format='{{ .version_base }}-{{ .buildID }}-{{ .arch }}' --ubuntu-tag-format='{{ .version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' --verify='false' --grafana-dir=$$PWD @@ -2581,7 +2581,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -2595,7 +2595,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2604,14 +2604,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -2632,7 +2632,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -2653,7 +2653,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -2669,7 +2669,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -2685,7 +2685,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -2701,7 +2701,7 @@ steps: environment: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: remote-alertmanager-integration-tests trigger: branch: main @@ -2960,7 +2960,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2969,21 +2969,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang - go list -f '{{.Dir}}/...' -m | xargs go test -short -covermode=atomic -timeout=5m depends_on: - wire-install - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: test-backend - commands: - apk add --update build-base @@ -2992,7 +2992,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: test-backend-integration trigger: branch: @@ -3035,22 +3035,22 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: compile-build-cmd - commands: - apk add --update make - make gen-go depends_on: [] - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: wire-install - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: validate-openapi-spec trigger: branch: @@ -3129,7 +3129,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -3143,7 +3143,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -3152,14 +3152,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -3180,7 +3180,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -3201,7 +3201,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -3217,7 +3217,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -3233,7 +3233,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -3249,7 +3249,7 @@ steps: environment: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: remote-alertmanager-integration-tests trigger: branch: @@ -3349,7 +3349,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -3481,7 +3481,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -3622,7 +3622,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: compile-build-cmd - commands: - ./bin/build artifacts packages --artifacts-editions=oss --tag $${DRONE_TAG} --src-bucket @@ -3714,7 +3714,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: compile-build-cmd - commands: - yarn install --immutable || yarn install --immutable @@ -3814,7 +3814,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: compile-build-cmd - depends_on: - compile-build-cmd @@ -3911,7 +3911,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: compile-build-cmd - commands: - ./bin/build publish grafana-com --edition oss ${DRONE_TAG} @@ -3973,7 +3973,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.23.4 + GO_VERSION: 1.23.5 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4048,7 +4048,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.23.4 + GO_VERSION: 1.23.5 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4105,13 +4105,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: compile-build-cmd - commands: - ./bin/build whatsnew-checker depends_on: - compile-build-cmd - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: whats-new-checker trigger: event: @@ -4210,7 +4210,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.23.4 + GO_VERSION: 1.23.5 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4361,7 +4361,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -4370,21 +4370,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang - go list -f '{{.Dir}}/...' -m | xargs go test -short -covermode=atomic -timeout=5m depends_on: - wire-install - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: test-backend - commands: - apk add --update build-base @@ -4393,7 +4393,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: test-backend-integration trigger: cron: @@ -4447,7 +4447,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.23.4 + GO_VERSION: 1.23.5 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4591,7 +4591,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.23.4 + GO_VERSION: 1.23.5 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4698,7 +4698,7 @@ steps: - export GITHUB_TOKEN=$(cat /github-app/token) - 'dagger run --silent /src/grafana-build artifacts -a $${ARTIFACTS} --grafana-ref=$${GRAFANA_REF} --enterprise-ref=$${ENTERPRISE_REF} --grafana-repo=$${GRAFANA_REPO} --version=$${VERSION} ' - - --go-version=1.23.4 + - --go-version=1.23.5 depends_on: - github-app-generate-token environment: @@ -4719,7 +4719,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.23.4 + GO_VERSION: 1.23.5 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4853,7 +4853,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -4862,14 +4862,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -4890,7 +4890,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -4911,7 +4911,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -4927,7 +4927,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -4943,7 +4943,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -4959,7 +4959,7 @@ steps: environment: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 - image: golang:1.23.4-alpine + image: golang:1.23.5-alpine name: remote-alertmanager-integration-tests trigger: event: @@ -5262,7 +5262,7 @@ steps: - commands: - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM docker:27-cli - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine/git:2.40.1 - - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.23.4-alpine + - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.23.5-alpine - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:22.11.0-alpine - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:22-bookworm - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM google/cloud-sdk:431.0.0 @@ -5300,7 +5300,7 @@ steps: - commands: - trivy --exit-code 1 --severity HIGH,CRITICAL docker:27-cli - trivy --exit-code 1 --severity HIGH,CRITICAL alpine/git:2.40.1 - - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.23.4-alpine + - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.23.5-alpine - trivy --exit-code 1 --severity HIGH,CRITICAL node:22.11.0-alpine - trivy --exit-code 1 --severity HIGH,CRITICAL node:22-bookworm - trivy --exit-code 1 --severity HIGH,CRITICAL google/cloud-sdk:431.0.0 @@ -5569,6 +5569,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: be82e983dfa15f85f82935674ec109056f519ff99c7ab1f4be71f9ce62b571a7 +hmac: 154c1f072294cef09ba4f579eed30b1e29bc5c263897c862f4574432d321502c ... diff --git a/Dockerfile b/Dockerfile index ceaa2f35279..719a3009a25 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG BASE_IMAGE=alpine:3.20 ARG JS_IMAGE=node:22-alpine ARG JS_PLATFORM=linux/amd64 -ARG GO_IMAGE=golang:1.23.1-alpine +ARG GO_IMAGE=golang:1.23.5-alpine ARG GO_SRC=go-builder ARG JS_SRC=js-builder diff --git a/Makefile b/Makefile index bf00ee389ab..3df11c69545 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ WIRE_TAGS = "oss" include .bingo/Variables.mk GO = go -GO_VERSION = 1.23.4 +GO_VERSION = 1.23.5 GO_LINT_FILES ?= $(shell ./scripts/go-workspace/golangci-lint-includes.sh) GO_TEST_FILES ?= $(shell ./scripts/go-workspace/test-includes.sh) SH_FILES ?= $(shell find ./scripts -name *.sh) diff --git a/apps/alerting/notifications/go.mod b/apps/alerting/notifications/go.mod index 8652ac7f708..2d88581dc52 100644 --- a/apps/alerting/notifications/go.mod +++ b/apps/alerting/notifications/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/alerting/notifications -go 1.23.4 +go 1.23.5 replace github.com/grafana/grafana => ../../.. diff --git a/go.mod b/go.mod index 30fc9daa77a..1b2a6556e0e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana -go 1.23.4 +go 1.23.5 require ( buf.build/gen/go/parca-dev/parca/connectrpc/go v1.17.0-20240902100956-02fd72488966.1 // @grafana/observability-traces-and-profiling diff --git a/go.work b/go.work index e33309c0552..6fb73b7dde6 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.23.4 +go 1.23.5 // The `skip:golangci-lint` comment tag is used to exclude the package from the `golangci-lint` GitHub Action. // The module at the root of the repo (`.`) is excluded because ./pkg/... is included manually in the `golangci-lint` configuration. diff --git a/pkg/storage/unified/apistore/go.mod b/pkg/storage/unified/apistore/go.mod index c512b9bfe00..a2350ab1a9d 100644 --- a/pkg/storage/unified/apistore/go.mod +++ b/pkg/storage/unified/apistore/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/storage/unified/apistore -go 1.23.4 +go 1.23.5 replace ( github.com/grafana/grafana => ../../../.. diff --git a/pkg/storage/unified/resource/go.mod b/pkg/storage/unified/resource/go.mod index f3428da429a..36be0fe79ac 100644 --- a/pkg/storage/unified/resource/go.mod +++ b/pkg/storage/unified/resource/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/storage/unified/resource -go 1.23.4 +go 1.23.5 replace ( github.com/grafana/grafana => ../../../.. diff --git a/scripts/drone/variables.star b/scripts/drone/variables.star index ec9e803a101..01147f6df17 100644 --- a/scripts/drone/variables.star +++ b/scripts/drone/variables.star @@ -3,7 +3,7 @@ global variables """ grabpl_version = "v3.1.1" -golang_version = "1.23.4" +golang_version = "1.23.5" # nodejs_version should match what's in ".nvmrc", but without the v prefix. nodejs_version = "22.11.0"