TUN-8407: Upgrade go to version 1.22.2

.github/workflows/check.yaml

@@ -4,7 +4,7 @@ jobs:
  check:
  strategy:
  matrix:
- go-version: [1.21.x]
+ go-version: [1.22.x]
  os: [ubuntu-latest, macos-latest, windows-latest]
  runs-on: ${{ matrix.os }}
  steps:

.teamcity/install-cloudflare-go.sh

@@ -3,6 +3,6 @@
 cd /tmp
 git clone -q https://github.com/cloudflare/go
 cd go/src
-# https://github.com/cloudflare/go/tree/34129e47042e214121b6bbff0ded4712debed18e is version go1.21.5-devel-cf
-git checkout -q 34129e47042e214121b6bbff0ded4712debed18e
+# https://github.com/cloudflare/go/tree/ec0a014545f180b0c74dfd687698657a9e86e310 is version go1.22.2-devel-cf
+git checkout -q ec0a014545f180b0c74dfd687698657a9e86e310
 ./make.bash

.teamcity/windows/install-cloudflare-go.ps1

@@ -9,8 +9,8 @@ Set-Location "$Env:Temp"
 git clone -q https://github.com/cloudflare/go
 Write-Output "Building go..."
 cd go/src
-# https://github.com/cloudflare/go/tree/34129e47042e214121b6bbff0ded4712debed18e is version go1.21.5-devel-cf
-git checkout -q 34129e47042e214121b6bbff0ded4712debed18e
+# https://github.com/cloudflare/go/tree/ec0a014545f180b0c74dfd687698657a9e86e310 is version go1.22.2-devel-cf
+git checkout -q ec0a014545f180b0c74dfd687698657a9e86e310
 & ./make.bat
 
 Write-Output "Installed"

.teamcity/windows/install-go-msi.ps1

@@ -1,20 +1,20 @@
 $ErrorActionPreference = "Stop"
 $ProgressPreference = "SilentlyContinue"
-$GoMsiVersion = "go1.21.5.windows-amd64.msi"
- 
+$GoMsiVersion = "go1.22.2.windows-amd64.msi"
+
 Write-Output "Downloading go installer..."
- 
+
 Set-Location "$Env:Temp"
- 
+
 (New-Object System.Net.WebClient).DownloadFile(
  "https://go.dev/dl/$GoMsiVersion",
  "$Env:Temp\$GoMsiVersion"
 )
- 
+
 Write-Output "Installing go..."
 Install-Package "$Env:Temp\$GoMsiVersion" -Force
- 
+
 # Go installer updates global $PATH
 go env
- 
+
 Write-Output "Installed"

Dockerfile

@@ -1,7 +1,7 @@
 # use a builder image for building cloudflare
 ARG TARGET_GOOS
 ARG TARGET_GOARCH
-FROM golang:1.21.5 as builder
+FROM golang:1.22.2 as builder
 ENV GO111MODULE=on \
  CGO_ENABLED=0 \
  TARGET_GOOS=${TARGET_GOOS} \

Dockerfile.amd64

@@ -1,8 +1,8 @@
 # use a builder image for building cloudflare
-FROM golang:1.21.5 as builder
+FROM golang:1.22.2 as builder
 ENV GO111MODULE=on \
- CGO_ENABLED=0 
- 
+ CGO_ENABLED=0
+
 WORKDIR /go/src/github.com/cloudflare/cloudflared/
 
 # copy our sources into the builder image

Dockerfile.arm64

@@ -1,8 +1,8 @@
 # use a builder image for building cloudflare
-FROM golang:1.21.5 as builder
+FROM golang:1.22.2 as builder
 ENV GO111MODULE=on \
- CGO_ENABLED=0 
- 
+ CGO_ENABLED=0
+
 WORKDIR /go/src/github.com/cloudflare/cloudflared/
 
 # copy our sources into the builder image

cfsetup.yaml

@@ -1,4 +1,4 @@
-pinned_go: &pinned_go go-boring=1.21.5-1
+pinned_go: &pinned_go go-boring=1.22.2-1
 
 build_dir: &build_dir /cfsetup_build
 default-flavor: bullseye
@@ -33,11 +33,11 @@ buster: &buster
  - ./build-packages-fips.sh
  # Build binary for component test
  - GOOS=linux GOARCH=amd64 make cloudflared
- cover: 
+ cover:
  build_dir: *build_dir
  builddeps: *build_deps
  pre-cache: *build_pre_cache
- post-cache: 
+ post-cache:
  - make cover
  # except FIPS (handled in github-fips-release-pkgs) and macos (handled in github-release-macos-amd64)
  github-release-pkgs:
@@ -96,7 +96,7 @@ buster: &buster
  - make github-release-built-pkgs
  generate-versions-file:
  build_dir: *build_dir
- builddeps: 
+ builddeps:
  - *pinned_go
  - build-essential
  post-cache:

dev.Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21.5 as builder
+FROM golang:1.22.2 as builder
 ENV GO111MODULE=on \
  CGO_ENABLED=0
 WORKDIR /go/src/github.com/cloudflare/cloudflared/

go.mod

@@ -1,6 +1,6 @@
 module github.com/cloudflare/cloudflared
 
-go 1.21
+go 1.22
 
 require (
  github.com/coredns/coredns v1.10.0
@@ -16,7 +16,7 @@ require (
  github.com/gobwas/ws v1.0.4
  github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
  github.com/google/gopacket v1.1.19
- github.com/google/uuid v1.3.1
+ github.com/google/uuid v1.6.0
  github.com/gorilla/websocket v1.4.2
  github.com/json-iterator/go v1.1.12
  github.com/mattn/go-colorable v0.1.13
@@ -27,21 +27,21 @@ require (
  github.com/prometheus/client_model v0.2.0
  github.com/quic-go/quic-go v0.42.0
  github.com/rs/zerolog v1.20.0
- github.com/stretchr/testify v1.8.4
+ github.com/stretchr/testify v1.9.0
  github.com/urfave/cli/v2 v2.3.0
  go.opentelemetry.io/contrib/propagators v0.22.0
- go.opentelemetry.io/otel v1.21.0
- go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0
- go.opentelemetry.io/otel/sdk v1.21.0
- go.opentelemetry.io/otel/trace v1.21.0
- go.opentelemetry.io/proto/otlp v1.0.0
+ go.opentelemetry.io/otel v1.26.0
+ go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.26.0
+ go.opentelemetry.io/otel/sdk v1.26.0
+ go.opentelemetry.io/otel/trace v1.26.0
+ go.opentelemetry.io/proto/otlp v1.2.0
  go.uber.org/automaxprocs v1.4.0
- golang.org/x/crypto v0.21.0
- golang.org/x/net v0.21.0
- golang.org/x/sync v0.4.0
- golang.org/x/sys v0.18.0
- golang.org/x/term v0.18.0
- google.golang.org/protobuf v1.31.0
+ golang.org/x/crypto v0.23.0
+ golang.org/x/net v0.25.0
+ golang.org/x/sync v0.6.0
+ golang.org/x/sys v0.20.0
+ golang.org/x/term v0.20.0
+ google.golang.org/protobuf v1.34.1
  gopkg.in/natefinch/lumberjack.v2 v2.0.0
  gopkg.in/yaml.v3 v3.0.1
  nhooyr.io/websocket v1.8.7
@@ -61,14 +61,14 @@ require (
  github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect
  github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 // indirect
  github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect
- github.com/go-logr/logr v1.3.0 // indirect
+ github.com/go-logr/logr v1.4.1 // indirect
  github.com/go-logr/stdr v1.2.2 // indirect
  github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
  github.com/gobwas/httphead v0.0.0-20200921212729-da3d93bc3c58 // indirect
  github.com/gobwas/pool v0.2.1 // indirect
- github.com/golang/protobuf v1.5.3 // indirect
+ github.com/golang/protobuf v1.5.4 // indirect
  github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
- github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
+ github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
  github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
  github.com/klauspost/compress v1.15.11 // indirect
  github.com/kr/text v0.2.0 // indirect
@@ -83,17 +83,17 @@ require (
  github.com/prometheus/common v0.37.0 // indirect
  github.com/prometheus/procfs v0.8.0 // indirect
  github.com/russross/blackfriday/v2 v2.1.0 // indirect
- go.opentelemetry.io/otel/metric v1.21.0 // indirect
+ go.opentelemetry.io/otel/metric v1.26.0 // indirect
  go.uber.org/mock v0.4.0 // indirect
  golang.org/x/exp v0.0.0-20221205204356-47842c84f3db // indirect
  golang.org/x/mod v0.11.0 // indirect
- golang.org/x/oauth2 v0.13.0 // indirect
- golang.org/x/text v0.14.0 // indirect
+ golang.org/x/oauth2 v0.17.0 // indirect
+ golang.org/x/text v0.15.0 // indirect
  golang.org/x/tools v0.9.1 // indirect
  google.golang.org/appengine v1.6.8 // indirect
- google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 // indirect
- google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
- google.golang.org/grpc v1.60.0 // indirect
+ google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
+ google.golang.org/grpc v1.63.0 // indirect
  gopkg.in/yaml.v2 v2.4.0 // indirect
 )