From 0431ecf6bf00de5301b191f8a869c22d8ec41167 Mon Sep 17 00:00:00 2001 From: Amanda Hager Lopes de Andrade Katz Date: Fri, 17 Jul 2026 14:51:50 -0300 Subject: [PATCH] ROSAENG-61450 | chore: bump go.mod to 1.26.5 Follow-up to #3366: align go.mod, bingo tool modules, and renovate Go constraint with ubi9/go-toolset 1.26.5 already used by Dockerfiles. Drop deferred stdlib Snyk and govulncheck ignores fixed in Go >= 1.26.4. Depends on openshift/release#81830 (from: rosa-clients) so Prow presubmits compile with go-toolset 1.26.5 instead of ocp/builder 1.26.3. Signed-off-by: Amanda Hager Lopes de Andrade Katz Co-authored-by: Cursor Signed-off-by: Amanda Hager Lopes de Andrade Katz --- .bingo/bingo.mod | 2 +- .bingo/gci.mod | 2 +- .bingo/go-bindata.mod | 2 +- .bingo/golangci-lint.mod | 2 +- .bingo/goreleaser.mod | 2 +- .bingo/govulncheck.mod | 2 +- .bingo/mockgen.mod | 2 +- .govulncheck-ignore.yaml | 11 +---------- .snyk | 22 ---------------------- go.mod | 2 +- renovate.json | 2 +- 11 files changed, 10 insertions(+), 41 deletions(-) diff --git a/.bingo/bingo.mod b/.bingo/bingo.mod index 271199eabe..e8aa2dfd1a 100644 --- a/.bingo/bingo.mod +++ b/.bingo/bingo.mod @@ -1,5 +1,5 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT -go 1.26.3 +go 1.26.5 require github.com/bwplotka/bingo v0.10.0 diff --git a/.bingo/gci.mod b/.bingo/gci.mod index 8057ec6aa3..db8b59169d 100644 --- a/.bingo/gci.mod +++ b/.bingo/gci.mod @@ -1,5 +1,5 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT -go 1.26.3 +go 1.26.5 require github.com/daixiang0/gci v0.14.0 diff --git a/.bingo/go-bindata.mod b/.bingo/go-bindata.mod index e911d0144f..1579a5c07d 100644 --- a/.bingo/go-bindata.mod +++ b/.bingo/go-bindata.mod @@ -1,5 +1,5 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT -go 1.26.3 +go 1.26.5 require github.com/go-bindata/go-bindata v3.1.2+incompatible // go-bindata diff --git a/.bingo/golangci-lint.mod b/.bingo/golangci-lint.mod index 033d71f80b..2a9a76c6f7 100644 --- a/.bingo/golangci-lint.mod +++ b/.bingo/golangci-lint.mod @@ -1,5 +1,5 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT -go 1.26.3 +go 1.26.5 require github.com/golangci/golangci-lint/v2 v2.12.2 // cmd/golangci-lint diff --git a/.bingo/goreleaser.mod b/.bingo/goreleaser.mod index 94a0e6be87..2b53724796 100644 --- a/.bingo/goreleaser.mod +++ b/.bingo/goreleaser.mod @@ -1,6 +1,6 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT -go 1.26.3 +go 1.26.5 require ( al.essio.dev/pkg/shellescape v1.6.0 // indirect diff --git a/.bingo/govulncheck.mod b/.bingo/govulncheck.mod index 7d6cf54c9c..08cc73deb6 100644 --- a/.bingo/govulncheck.mod +++ b/.bingo/govulncheck.mod @@ -1,5 +1,5 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT -go 1.25.8 +go 1.26.5 require golang.org/x/vuln v1.1.4 // cmd/govulncheck diff --git a/.bingo/mockgen.mod b/.bingo/mockgen.mod index 5a47ec5cf8..c61e883864 100644 --- a/.bingo/mockgen.mod +++ b/.bingo/mockgen.mod @@ -1,5 +1,5 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT -go 1.26.3 +go 1.26.5 require go.uber.org/mock v0.4.0 // mockgen diff --git a/.govulncheck-ignore.yaml b/.govulncheck-ignore.yaml index 5062a55a6f..82b956ca97 100644 --- a/.govulncheck-ignore.yaml +++ b/.govulncheck-ignore.yaml @@ -9,13 +9,4 @@ # - module: The exact module path where the vulnerability exists # - reason: Why this vulnerability is accepted -ignored_vulnerabilities: - - id: GO-2026-5037 - module: stdlib - reason: "Deferred until Go 1.26.4 toolchain is available (fix in v1.26.4; current go.mod: 1.25.8)" - - id: GO-2026-5038 - module: stdlib - reason: "Deferred until Go 1.26.4 toolchain is available (fix in v1.26.4; current go.mod: 1.25.8)" - - id: GO-2026-5039 - module: stdlib - reason: "Deferred until Go 1.26.4 toolchain is available (fix in v1.26.4; current go.mod: 1.25.8)" +ignored_vulnerabilities: [] diff --git a/.snyk b/.snyk index 16cf91c861..5d24619cc3 100644 --- a/.snyk +++ b/.snyk @@ -32,25 +32,3 @@ exclude: - "vendor/golang.org/x/crypto/ssh/**" - "vendor/golang.org/x/tools/**" - "vendor/k8s.io/klog/**" - -ignore: - SNYK-GOLANG-STDNETTEXTPROTO-17135843: - - "*": - reason: >- - Go stdlib fix requires 1.26.4; CI builder is still 1.26.3. - Remove when CI runs Go >= 1.26.4. - expires: 2026-08-01T00:00:00.000Z - - SNYK-GOLANG-STDMIME-17135844: - - "*": - reason: >- - Go stdlib fix requires 1.26.4; CI builder is still 1.26.3. - Remove when CI runs Go >= 1.26.4. - expires: 2026-08-01T00:00:00.000Z - - SNYK-GOLANG-STDCRYPTOX509-17135840: - - "*": - reason: >- - Go stdlib fix requires 1.26.4; CI builder is still 1.26.3. - Remove when CI runs Go >= 1.26.4. - expires: 2026-08-01T00:00:00.000Z diff --git a/go.mod b/go.mod index 2b9201d9a9..c6dd0edc5d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/openshift/rosa -go 1.26.3 +go 1.26.5 require ( github.com/AlecAivazis/survey/v2 v2.3.7 diff --git a/renovate.json b/renovate.json index d9bd1c8ff2..266e82df6c 100644 --- a/renovate.json +++ b/renovate.json @@ -37,7 +37,7 @@ }, "gomod": { "constraints": { - "go": "1.26.3" + "go": "1.26.5" }, "managerFilePatterns": [ "/(^|/)\\.bingo/[^/]+\\.mod$/"