From c9741a5e0c528ce94f935892a23cd09cc02ca86b Mon Sep 17 00:00:00 2001 From: Dave Henderson Date: Fri, 13 Sep 2024 16:51:05 -0400 Subject: [PATCH] [v11.2.x] Chore: Bump Go to 1.22.7 Signed-off-by: Dave Henderson --- .drone.yml | 246 ++++++++++++++-------------- Dockerfile | 2 +- Makefile | 2 +- go.mod | 2 +- go.work | 2 +- pkg/apimachinery/go.mod | 2 +- pkg/apiserver/go.mod | 2 +- pkg/build/go.mod | 2 +- pkg/build/wire/go.mod | 2 +- pkg/promlib/go.mod | 2 +- pkg/semconv/go.mod | 2 +- pkg/storage/unified/resource/go.mod | 2 +- scripts/drone/variables.star | 2 +- scripts/go-workspace/go.mod | 2 +- 14 files changed, 136 insertions(+), 136 deletions(-) diff --git a/.drone.yml b/.drone.yml index bbe73acf416..b2a364ec8c0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,7 +25,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: compile-build-cmd - commands: - ./bin/build verify-drone @@ -76,14 +76,14 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.22.7-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.22.4-alpine + image: golang:1.22.7-alpine name: lint-starlark trigger: event: @@ -377,7 +377,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -386,21 +386,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.4-alpine + image: golang:1.22.7-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.22.4-alpine + image: golang:1.22.7-alpine name: test-backend - commands: - apk add --update build-base @@ -409,7 +409,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: test-backend-integration trigger: event: @@ -461,7 +461,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: compile-build-cmd - commands: - apk add --update curl jq bash @@ -488,16 +488,16 @@ steps: - apk add --update make - make gen-go depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: wire-install - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: validate-openapi-spec trigger: event: @@ -556,7 +556,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -566,7 +566,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -575,14 +575,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: wire-install - commands: - yarn install --immutable || yarn install --immutable @@ -615,7 +615,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.22.4 --yarn-cache=$$YARN_CACHE_FOLDER + -a targz:grafana:linux/arm/v7 --go-version=1.22.7 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt depends_on: - yarn-install @@ -851,7 +851,7 @@ steps: - /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 -a docker:grafana:linux/arm/v7 -a docker:grafana:linux/arm/v7:ubuntu --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER - --go-version=1.22.4 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.19.1 --tag-format='{{ + --go-version=1.22.7 --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 - find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i @@ -995,7 +995,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -1009,7 +1009,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1018,14 +1018,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -1046,7 +1046,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -1067,7 +1067,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -1088,7 +1088,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -1104,7 +1104,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -1120,7 +1120,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -1137,7 +1137,7 @@ steps: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 failure: ignore - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: remote-alertmanager-integration-tests trigger: event: @@ -1225,7 +1225,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: verify-gen-cue trigger: event: @@ -1266,7 +1266,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: compile-build-cmd - commands: - apt-get update -yq && apt-get install shellcheck @@ -1338,7 +1338,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: swagger-gen trigger: event: @@ -1434,7 +1434,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1445,7 +1445,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - clone-enterprise - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1455,14 +1455,14 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - clone-enterprise - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: wire-install - commands: - apk add --update build-base @@ -1470,7 +1470,7 @@ steps: - go test -v -run=^$ -benchmem -timeout=1h -count=8 -bench=. ${GO_PACKAGES} depends_on: - wire-install - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: sqlite-benchmark-integration-tests - commands: - apk add --update build-base @@ -1482,7 +1482,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: postgres-benchmark-integration-tests - commands: - apk add --update build-base @@ -1493,7 +1493,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: mysql-5.7-benchmark-integration-tests - commands: - apk add --update build-base @@ -1504,7 +1504,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: mysql-8.0-benchmark-integration-tests trigger: event: @@ -1582,7 +1582,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: verify-gen-cue trigger: branch: main @@ -1755,7 +1755,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1764,21 +1764,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.4-alpine + image: golang:1.22.7-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.22.4-alpine + image: golang:1.22.7-alpine name: test-backend - commands: - apk add --update build-base @@ -1787,7 +1787,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: test-backend-integration trigger: branch: main @@ -1832,22 +1832,22 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: compile-build-cmd - commands: - apk add --update make - make gen-go depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: wire-install - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: validate-openapi-spec - commands: - ./bin/build verify-drone @@ -1964,7 +1964,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1974,7 +1974,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1983,14 +1983,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: wire-install - commands: - yarn install --immutable || yarn install --immutable @@ -2022,7 +2022,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.22.4 --yarn-cache=$$YARN_CACHE_FOLDER + -a targz:grafana:linux/arm/v7 --go-version=1.22.7 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt depends_on: - update-package-json-version @@ -2294,7 +2294,7 @@ steps: - /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 -a docker:grafana:linux/arm/v7 -a docker:grafana:linux/arm/v7:ubuntu --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER - --go-version=1.22.4 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.19.1 --tag-format='{{ + --go-version=1.22.7 --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 - find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i @@ -2500,7 +2500,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -2514,7 +2514,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2523,14 +2523,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -2551,7 +2551,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -2572,7 +2572,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -2593,7 +2593,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -2609,7 +2609,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -2625,7 +2625,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -2642,7 +2642,7 @@ steps: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 failure: ignore - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: remote-alertmanager-integration-tests trigger: branch: main @@ -2952,7 +2952,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2961,21 +2961,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.4-alpine + image: golang:1.22.7-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.22.4-alpine + image: golang:1.22.7-alpine name: test-backend - commands: - apk add --update build-base @@ -2984,7 +2984,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: test-backend-integration trigger: branch: @@ -3027,22 +3027,22 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: compile-build-cmd - commands: - apk add --update make - make gen-go depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: wire-install - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: validate-openapi-spec trigger: branch: @@ -3132,7 +3132,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -3146,7 +3146,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -3155,14 +3155,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -3183,7 +3183,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -3204,7 +3204,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -3225,7 +3225,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -3241,7 +3241,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -3257,7 +3257,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -3274,7 +3274,7 @@ steps: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 failure: ignore - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: remote-alertmanager-integration-tests trigger: branch: @@ -3377,7 +3377,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -3508,7 +3508,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -3644,7 +3644,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: compile-build-cmd - commands: - ./bin/build artifacts packages --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET} @@ -3729,7 +3729,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: compile-build-cmd - commands: - yarn install --immutable || yarn install --immutable @@ -3953,7 +3953,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: compile-build-cmd - depends_on: - compile-build-cmd @@ -4171,7 +4171,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.22.4 + GO_VERSION: 1.22.7 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4229,13 +4229,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: compile-build-cmd - commands: - ./bin/build whatsnew-checker depends_on: - compile-build-cmd - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: whats-new-checker trigger: event: @@ -4337,7 +4337,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -4346,21 +4346,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.4-alpine + image: golang:1.22.7-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.22.4-alpine + image: golang:1.22.7-alpine name: test-backend - commands: - apk add --update build-base @@ -4369,7 +4369,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: test-backend-integration trigger: event: @@ -4426,7 +4426,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.22.4 + GO_VERSION: 1.22.7 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4609,7 +4609,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.22.4 + GO_VERSION: 1.22.7 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4758,7 +4758,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -4767,21 +4767,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.4-alpine + image: golang:1.22.7-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.22.4-alpine + image: golang:1.22.7-alpine name: test-backend - commands: - apk add --update build-base @@ -4790,7 +4790,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: test-backend-integration trigger: cron: @@ -4845,7 +4845,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.22.4 + GO_VERSION: 1.22.7 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4992,7 +4992,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.22.4 + GO_VERSION: 1.22.7 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -5081,7 +5081,7 @@ steps: - commands: - '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.22.4 + - --go-version=1.22.7 environment: _EXPERIMENTAL_DAGGER_CLOUD_TOKEN: from_secret: dagger_token @@ -5102,7 +5102,7 @@ steps: from_secret: gcp_key_base64 GITHUB_TOKEN: from_secret: github_token - GO_VERSION: 1.22.4 + GO_VERSION: 1.22.7 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -5192,20 +5192,20 @@ steps: - commands: [] depends_on: - clone - image: golang:1.22.4-windowsservercore-1809 + image: golang:1.22.7-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.22.4-windowsservercore-1809 + image: golang:1.22.7-windowsservercore-1809 name: wire-install - commands: - go test -short -covermode=atomic -timeout=5m ./pkg/... depends_on: - wire-install - image: golang:1.22.4-windowsservercore-1809 + image: golang:1.22.7-windowsservercore-1809 name: test-backend trigger: event: @@ -5298,7 +5298,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -5307,14 +5307,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -5335,7 +5335,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -5356,7 +5356,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -5377,7 +5377,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -5393,7 +5393,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -5409,7 +5409,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -5426,7 +5426,7 @@ steps: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 failure: ignore - image: golang:1.22.4-alpine + image: golang:1.22.7-alpine name: remote-alertmanager-integration-tests trigger: event: @@ -5781,7 +5781,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.22.4-alpine + - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.22.7-alpine - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:20.9.0-alpine - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:20-bookworm - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM google/cloud-sdk:431.0.0 @@ -5818,7 +5818,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.22.4-alpine + - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.22.7-alpine - trivy --exit-code 1 --severity HIGH,CRITICAL node:20.9.0-alpine - trivy --exit-code 1 --severity HIGH,CRITICAL node:20-bookworm - trivy --exit-code 1 --severity HIGH,CRITICAL google/cloud-sdk:431.0.0 @@ -6074,6 +6074,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: 191c339ebaea71688598006d5b3b7abf073fe1fc054ef82cdc0a87f5080c4e06 +hmac: d433e0f8f055bb306fdcdfd7a74817139bc2a800d47d366f5d1e17af2de3d1ec ... diff --git a/Dockerfile b/Dockerfile index 416b2a5b5b8..43be9658ce3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE=alpine:3.19.1 ARG JS_IMAGE=node:20-alpine ARG JS_PLATFORM=linux/amd64 -ARG GO_IMAGE=golang:1.22.4-alpine +ARG GO_IMAGE=golang:1.22.7-alpine ARG GO_SRC=go-builder ARG JS_SRC=js-builder diff --git a/Makefile b/Makefile index 1424ea96ce0..af494e6f725 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ WIRE_TAGS = "oss" include .bingo/Variables.mk GO = go -GO_VERSION = 1.22.4 +GO_VERSION = 1.22.7 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/go.mod b/go.mod index 5f4afe91fbf..6a20bf6c92b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana -go 1.22.4 +go 1.22.7 // contains openapi encoder fixes. remove ASAP replace cuelang.org/go => github.com/grafana/cue v0.0.0-20230926092038-971951014e3f // @grafana/grafana-as-code diff --git a/go.work b/go.work index aefa6dda97f..39cb5ac0d38 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.22.4 +go 1.22.7 // 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/apimachinery/go.mod b/pkg/apimachinery/go.mod index e932647a0aa..a0f21f97f03 100644 --- a/pkg/apimachinery/go.mod +++ b/pkg/apimachinery/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/apimachinery -go 1.22.4 +go 1.22.7 require ( github.com/grafana/authlib v0.0.0-20240730122259-a0d13672efb1 diff --git a/pkg/apiserver/go.mod b/pkg/apiserver/go.mod index 29939ea3ce1..45af7d1434d 100644 --- a/pkg/apiserver/go.mod +++ b/pkg/apiserver/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/apiserver -go 1.22.4 +go 1.22.7 require ( github.com/google/go-cmp v0.6.0 diff --git a/pkg/build/go.mod b/pkg/build/go.mod index 34b3cdd27de..4178aafa553 100644 --- a/pkg/build/go.mod +++ b/pkg/build/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/build -go 1.22.4 +go 1.22.7 // Override docker/docker to avoid: // go: github.com/drone-runners/drone-runner-docker@v1.8.2 requires diff --git a/pkg/build/wire/go.mod b/pkg/build/wire/go.mod index 1aef58c93d1..d9d5cbfc25c 100644 --- a/pkg/build/wire/go.mod +++ b/pkg/build/wire/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/build/wire -go 1.22.4 +go 1.22.7 require ( github.com/google/go-cmp v0.6.0 diff --git a/pkg/promlib/go.mod b/pkg/promlib/go.mod index 4701f263219..66b5ec6b9e6 100644 --- a/pkg/promlib/go.mod +++ b/pkg/promlib/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/promlib -go 1.22.4 +go 1.22.7 require ( github.com/grafana/grafana-plugin-sdk-go v0.241.0 diff --git a/pkg/semconv/go.mod b/pkg/semconv/go.mod index 52890761c48..56bbcca79b8 100644 --- a/pkg/semconv/go.mod +++ b/pkg/semconv/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/semconv -go 1.22.4 +go 1.22.7 require go.opentelemetry.io/otel v1.28.0 diff --git a/pkg/storage/unified/resource/go.mod b/pkg/storage/unified/resource/go.mod index 2ce0faad857..04748e51b86 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.22.4 +go 1.22.7 require ( github.com/fullstorydev/grpchan v1.1.1 diff --git a/scripts/drone/variables.star b/scripts/drone/variables.star index b6559555890..d8db5988678 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.22.4" +golang_version = "1.22.7" # nodejs_version should match what's in ".nvmrc", but without the v prefix. nodejs_version = "20.9.0" diff --git a/scripts/go-workspace/go.mod b/scripts/go-workspace/go.mod index 4e238661615..1d9700fb4ee 100644 --- a/scripts/go-workspace/go.mod +++ b/scripts/go-workspace/go.mod @@ -1,5 +1,5 @@ module github.com/grafana/grafana/scripts/go-workspace -go 1.22.4 +go 1.22.7 require golang.org/x/mod v0.20.0