From 747562d9a57721b7b687cc2af970fb272f3a2366 Mon Sep 17 00:00:00 2001 From: Alan Parra Date: Thu, 9 Jan 2025 11:46:10 -0300 Subject: [PATCH] [v15] Use Go 1.22.x as the module version (#50879) * Use Go 1.22.x as the module version * Update .golangci.yml Go version to 1.22 * Remove golangci-lint exemptions related to Go 1.22 --- .golangci.yml | 11 +---------- go.mod | 4 +--- integrations/event-handler/go.mod | 4 +--- integrations/terraform/go.mod | 4 +--- 4 files changed, 4 insertions(+), 19 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 70151566c5c45..9280f20acbd99 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -24,15 +24,6 @@ issues: - linters: [testifylint] text: "suite-thelper: suite helper method must start with" path: 'integrations/.+' - # Go 1.22 related warnings. - # These are OK because our toolchain is 1.22 or newer. - - linters: [govet] - text: "stdversion: cmp.Or requires go1.22 or later" - - linters: [govet] - text: "stdversion: rand.New requires go1.22 or later" - - linters: [govet] - text: "stdversion: rand.NewPCG requires go1.22 or later" - exclude-use-default: true max-same-issues: 0 max-issues-per-linter: 0 @@ -157,6 +148,6 @@ linters-settings: - suite-thelper run: - go: '1.21' + go: '1.22' build-tags: [] timeout: 15m diff --git a/go.mod b/go.mod index 99f6a22c404cb..7cc600191910a 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/gravitational/teleport -go 1.21 - -toolchain go1.22.10 +go 1.22.10 require ( cloud.google.com/go/cloudsqlconn v1.9.0 diff --git a/integrations/event-handler/go.mod b/integrations/event-handler/go.mod index 4e0c9eff22650..a066ba64cd680 100644 --- a/integrations/event-handler/go.mod +++ b/integrations/event-handler/go.mod @@ -1,8 +1,6 @@ module github.com/gravitational/teleport/integrations/event-handler -go 1.21 - -toolchain go1.22.10 +go 1.22.10 require ( github.com/alecthomas/kong v0.9.0 diff --git a/integrations/terraform/go.mod b/integrations/terraform/go.mod index 555ecaba5112a..cac13fe95560d 100644 --- a/integrations/terraform/go.mod +++ b/integrations/terraform/go.mod @@ -1,8 +1,6 @@ module github.com/gravitational/teleport/integrations/terraform -go 1.21 - -toolchain go1.22.10 +go 1.22.10 require ( github.com/gogo/protobuf v1.3.2