TUN-7584: Bump go 1.20.6

DevinCarr · DevinCarr · commit 65247b6f0f2f · 2023-07-26T13:52:40.000-07:00
Pins all docker and cfsetup builds to a specific go patch version.
Also ran go fix on repo.
diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml
@@ -4,7 +4,7 @@ jobs:
   check:
     strategy:
       matrix:
-        go-version: [1.19.x]
+        go-version: [1.20.x]
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 # use a builder image for building cloudflare
 ARG TARGET_GOOS
 ARG TARGET_GOARCH
-FROM golang:1.19 as builder
+FROM golang:1.20.6 as builder
 ENV GO111MODULE=on \
     CGO_ENABLED=0 \
     TARGET_GOOS=${TARGET_GOOS} \
diff --git a/Dockerfile.amd64 b/Dockerfile.amd64
@@ -1,5 +1,5 @@
 # use a builder image for building cloudflare
-FROM golang:1.19 as builder
+FROM golang:1.20.6 as builder
 ENV GO111MODULE=on \
     CGO_ENABLED=0 
     
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
@@ -1,5 +1,5 @@
 # use a builder image for building cloudflare
-FROM golang:1.19 as builder
+FROM golang:1.20.6 as builder
 ENV GO111MODULE=on \
     CGO_ENABLED=0 
     
diff --git a/cfsetup.yaml b/cfsetup.yaml
@@ -1,5 +1,5 @@
-pinned_go: &pinned_go go=1.19.6-1
-pinned_go_fips: &pinned_go_fips go-boring=1.19.6-1
+pinned_go: &pinned_go go=1.20.6-1
+pinned_go_fips: &pinned_go_fips go-boring=1.20.6-1
 
 build_dir: &build_dir /cfsetup_build
 default-flavor: bullseye
diff --git a/cmd/cloudflared/generic_service.go b/cmd/cloudflared/generic_service.go
@@ -1,5 +1,4 @@
 //go:build !windows && !darwin && !linux
-// +build !windows,!darwin,!linux
 
 package main
 
diff --git a/cmd/cloudflared/linux_service.go b/cmd/cloudflared/linux_service.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package main
 
diff --git a/cmd/cloudflared/macos_service.go b/cmd/cloudflared/macos_service.go
@@ -1,5 +1,4 @@
 //go:build darwin
-// +build darwin
 
 package main
 
diff --git a/cmd/cloudflared/tunnel/configuration_test.go b/cmd/cloudflared/tunnel/configuration_test.go
@@ -1,5 +1,4 @@
 //go:build ignore
-// +build ignore
 
 // TODO: Remove the above build tag and include this test when we start compiling with Golang 1.10.0+
 
diff --git a/cmd/cloudflared/tunnel/signal_test.go b/cmd/cloudflared/tunnel/signal_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package tunnel
 
diff --git a/cmd/cloudflared/updater/workers_service_test.go b/cmd/cloudflared/updater/workers_service_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package updater
 
diff --git a/cmd/cloudflared/windows_service.go b/cmd/cloudflared/windows_service.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package main
 
diff --git a/dev.Dockerfile b/dev.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.19 as builder
+FROM golang:1.20.6 as builder
 ENV GO111MODULE=on \
     CGO_ENABLED=0
 WORKDIR /go/src/github.com/cloudflare/cloudflared/
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/cloudflare/cloudflared
 
-go 1.19
+go 1.20
 
 require (
 	github.com/cloudflare/golibs v0.0.0-20170913112048-333127dbecfc
@@ -110,8 +110,5 @@ replace gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1
 replace github.com/quic-go/quic-go => github.com/devincarr/quic-go v0.0.0-20230502200822-d1f4edacbee7
 
 // Post-quantum tunnel RTG-1339
-replace (
-	// Branches go1.19 go1.20 on github.com/cloudflare/qtls-pq
-	github.com/quic-go/qtls-go1-19 => github.com/cloudflare/qtls-pq v0.0.0-20230320123031-3faac1a945b2
-	github.com/quic-go/qtls-go1-20 => github.com/cloudflare/qtls-pq v0.0.0-20230320122459-4ed280d0d633
-)
+// Branches go1.20 on github.com/cloudflare/qtls-pq
+replace github.com/quic-go/qtls-go1-20 => github.com/cloudflare/qtls-pq v0.0.0-20230320122459-4ed280d0d633
diff --git a/go.sum b/go.sum
@@ -65,8 +65,6 @@ github.com/cloudflare/golibs v0.0.0-20170913112048-333127dbecfc h1:Dvk3ySBsOm5Ev
 github.com/cloudflare/golibs v0.0.0-20170913112048-333127dbecfc/go.mod h1:HlgKKR8V5a1wroIDDIz3/A+T+9Janfq+7n1P5sEFdi0=
 github.com/cloudflare/qtls-pq v0.0.0-20230320122459-4ed280d0d633 h1:ZTub2XMOBpxyBiJf6Q+UKqAi07yt1rZmFitriHvFd8M=
 github.com/cloudflare/qtls-pq v0.0.0-20230320122459-4ed280d0d633/go.mod h1:j/igSUc4PgBMayIsBGjAFu2i7g663rm6kZrKy4htb7E=
-github.com/cloudflare/qtls-pq v0.0.0-20230320123031-3faac1a945b2 h1:0/KuLjh9lBMiXlooAdwoo+FbLVD5DABtquB0ImEFOK0=
-github.com/cloudflare/qtls-pq v0.0.0-20230320123031-3faac1a945b2/go.mod h1:XzuZIjv4mF5cM205RHHW1d60PQtWGwMR6jx38YKuYHs=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
@@ -337,6 +335,8 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1
 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo=
 github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
+github.com/quic-go/qtls-go1-19 v0.3.2 h1:tFxjCFcTQzK+oMxG6Zcvp4Dq8dx4yD3dDiIiyc86Z5U=
+github.com/quic-go/qtls-go1-19 v0.3.2/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
diff --git a/proxy/proxy_posix_test.go b/proxy/proxy_posix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package proxy
 
diff --git a/sshgen/sshgen_test.go b/sshgen/sshgen_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package sshgen
 
diff --git a/token/launch_browser_darwin.go b/token/launch_browser_darwin.go
@@ -1,5 +1,4 @@
 //go:build darwin
-// +build darwin
 
 package token
 
diff --git a/token/launch_browser_other.go b/token/launch_browser_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !darwin && !linux && !netbsd && !freebsd && !openbsd
-// +build !windows,!darwin,!linux,!netbsd,!freebsd,!openbsd
 
 package token
 
diff --git a/token/launch_browser_unix.go b/token/launch_browser_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd || openbsd || netbsd
-// +build linux freebsd openbsd netbsd
 
 package token
 
diff --git a/token/launch_browser_windows.go b/token/launch_browser_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package token
 
diff --git a/token/token_test.go b/token/token_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package token
 
diff --git a/vendor/github.com/quic-go/qtls-go1-19/cfkem.go b/vendor/github.com/quic-go/qtls-go1-19/cfkem.go
diff --git a/vendor/github.com/quic-go/qtls-go1-19/handshake_client.go b/vendor/github.com/quic-go/qtls-go1-19/handshake_client.go
diff --git a/vendor/github.com/quic-go/qtls-go1-19/handshake_client_tls13.go b/vendor/github.com/quic-go/qtls-go1-19/handshake_client_tls13.go
diff --git a/vendor/github.com/quic-go/qtls-go1-19/handshake_server_tls13.go b/vendor/github.com/quic-go/qtls-go1-19/handshake_server_tls13.go
diff --git a/vendor/github.com/quic-go/qtls-go1-19/key_agreement.go b/vendor/github.com/quic-go/qtls-go1-19/key_agreement.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
diff --git a/watcher/file_test.go b/watcher/file_test.go

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build !windows && !darwin && !linux`
`2`		`-// +build !windows,!darwin,!linux`
`3`	`2`
`4`	`3`	`package main`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build linux`
`2`		`-// +build linux`
`3`	`2`
`4`	`3`	`package main`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build darwin`
`2`		`-// +build darwin`
`3`	`2`
`4`	`3`	`package main`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build ignore`
`2`		`-// +build ignore`
`3`	`2`
`4`	`3`	`// TODO: Remove the above build tag and include this test when we start compiling with Golang 1.10.0+`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build !windows`
`2`		`-// +build !windows`
`3`	`2`
`4`	`3`	`package tunnel`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build windows`
`2`		`-// +build windows`
`3`	`2`
`4`	`3`	`package main`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM golang:1.19 as builder`
	`1`	`+FROM golang:1.20.6 as builder`
`2`	`2`	`ENV GO111MODULE=on \`
`3`	`3`	`CGO_ENABLED=0`
`4`	`4`	`WORKDIR /go/src/github.com/cloudflare/cloudflared/`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build !windows && !darwin && !linux && !netbsd && !freebsd && !openbsd`
`2`		`-// +build !windows,!darwin,!linux,!netbsd,!freebsd,!openbsd`
`3`	`2`
`4`	`3`	`package token`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build linux \|\| freebsd \|\| openbsd \|\| netbsd`
`2`		`-// +build linux freebsd openbsd netbsd`
`3`	`2`
`4`	`3`	`package token`
`5`	`4`