From 356dbb62adb7643d113d309bf45afa4532be0d94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Bedi?= Date: Mon, 17 Mar 2025 16:05:20 +0100 Subject: [PATCH] Update Go version and dependencies in workflow files (#1993) - Bump Go version from 1.23.5 to 1.24 in both publish and push workflows. - Upgrade github.com/grafana/grafana-plugin-sdk-go from v0.270.0 to v0.274.0. - Update golang.org/x/net from v0.35.0 to v0.37.0, golang.org/x/sync from v0.11.0 to v0.12.0, and golang.org/x/sys from v0.30.0 to v0.31.0. - Upgrade golang.org/x/text from v0.22.0 to v0.23.0. --- .changeset/four-cobras-invent.md | 5 +++++ .changeset/gentle-carrots-cough.md | 5 +++++ .changeset/witty-eels-camp.md | 5 +++++ .github/workflows/publish.yaml | 3 ++- .github/workflows/push.yaml | 3 ++- go.mod | 12 ++++++------ go.sum | 20 ++++++++++---------- 7 files changed, 35 insertions(+), 18 deletions(-) create mode 100644 .changeset/four-cobras-invent.md create mode 100644 .changeset/gentle-carrots-cough.md create mode 100644 .changeset/witty-eels-camp.md diff --git a/.changeset/four-cobras-invent.md b/.changeset/four-cobras-invent.md new file mode 100644 index 0000000..e42b8c9 --- /dev/null +++ b/.changeset/four-cobras-invent.md @@ -0,0 +1,5 @@ +--- +'grafana-zabbix': patch +--- + +Security: Update golang.org/x/net from v0.35.0 to v0.37.0 diff --git a/.changeset/gentle-carrots-cough.md b/.changeset/gentle-carrots-cough.md new file mode 100644 index 0000000..2f6ba2c --- /dev/null +++ b/.changeset/gentle-carrots-cough.md @@ -0,0 +1,5 @@ +--- +'grafana-zabbix': patch +--- + +Chore: Build plugin with go 1.24.1 diff --git a/.changeset/witty-eels-camp.md b/.changeset/witty-eels-camp.md new file mode 100644 index 0000000..362a6c5 --- /dev/null +++ b/.changeset/witty-eels-camp.md @@ -0,0 +1,5 @@ +--- +'grafana-zabbix': patch +--- + +Chore: Bump grafana-plugin-sdk-go from 0.270.0 to 0.274.0 diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 5383c79..91e4113 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -25,7 +25,8 @@ jobs: name: CD uses: grafana/plugin-ci-workflows/.github/workflows/cd.yml@main with: - go-version: '1.23.5' + go-version: '1.24' + golangci-lint-version: '1.64.6' branch: ${{ github.event.inputs.branch }} environment: ${{ github.event.inputs.environment }} docs-only: ${{ fromJSON(github.event.inputs.docs-only) }} diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 299189a..252f37c 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -11,6 +11,7 @@ jobs: name: CI uses: grafana/plugin-ci-workflows/.github/workflows/ci.yml@main with: - go-version: '1.23.5' + go-version: '1.24' + golangci-lint-version: '1.64.6' plugin-version-suffix: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || '' }} run-playwright: true diff --git a/go.mod b/go.mod index 59c0297..d044d13 100644 --- a/go.mod +++ b/go.mod @@ -1,15 +1,15 @@ module github.com/alexanderzobnin/grafana-zabbix -go 1.23.5 +go 1.24 require ( github.com/bitly/go-simplejson v0.5.1 github.com/dlclark/regexp2 v1.10.0 - github.com/grafana/grafana-plugin-sdk-go v0.270.0 + github.com/grafana/grafana-plugin-sdk-go v0.274.0 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/prometheus/client_golang v1.20.5 github.com/stretchr/testify v1.10.0 - golang.org/x/net v0.35.0 + golang.org/x/net v0.37.0 gotest.tools v2.2.0+incompatible ) @@ -91,9 +91,9 @@ require ( go.opentelemetry.io/proto/otlp v1.5.0 // indirect golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect golang.org/x/mod v0.22.0 // indirect - golang.org/x/sync v0.11.0 // indirect - golang.org/x/sys v0.30.0 // indirect - golang.org/x/text v0.22.0 // indirect + golang.org/x/sync v0.12.0 // indirect + golang.org/x/sys v0.31.0 // indirect + golang.org/x/text v0.23.0 // indirect golang.org/x/tools v0.28.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect diff --git a/go.sum b/go.sum index cba5801..f179469 100644 --- a/go.sum +++ b/go.sum @@ -72,8 +72,8 @@ github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1 github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= -github.com/grafana/grafana-plugin-sdk-go v0.270.0 h1:SST2Vo//ITQG5h401gC4jTkJpTHy8OV91sf2uDh6M/8= -github.com/grafana/grafana-plugin-sdk-go v0.270.0/go.mod h1:Z0Cvkj4WGadz6F6FQmK4NGb/hD18kTTNkSqFb97Rfyc= +github.com/grafana/grafana-plugin-sdk-go v0.274.0 h1:prTs+K4BfKYft89dJZmbUcXRIDtCnKQgnznpItE5ppQ= +github.com/grafana/grafana-plugin-sdk-go v0.274.0/go.mod h1:i/9KH9y/6m5hkRnG3H6aR2nOMPbJUmvo4XNrHjI15cU= github.com/grafana/otel-profiling-go v0.5.1 h1:stVPKAFZSa7eGiqbYuG25VcqYksR6iWvF3YH66t4qL8= github.com/grafana/otel-profiling-go v0.5.1/go.mod h1:ftN/t5A/4gQI19/8MoWurBEtC6gFw8Dns1sJZ9W4Tls= github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKtUuKQbJqgAIjlnicKg= @@ -261,13 +261,13 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= -golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= +golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c= +golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w= -golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw= +golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191020152052-9984515f0562/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -280,12 +280,12 @@ golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= -golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= +golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= -golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= +golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= +golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=