Skip to content

Commit 5ecba7e

Browse files
berndverstJoshVanL
authored and
elena-kolevska
committed
Bump to Go 1.22 - Pin latest contrib with Go 1.22 (dapr#7713)
* Pin latest contrib with Go 1.22 Signed-off-by: Bernd Verst <[email protected]> * Fix mysterious linter issue Signed-off-by: Bernd Verst <[email protected]> * Downgrade cosmosdb Signed-off-by: Bernd Verst <[email protected]> * Update go.mod Signed-off-by: Bernd Verst <[email protected]> * Fix CosmosDB for latest API version Signed-off-by: Bernd Verst <[email protected]> * Install gotestsum in Makefile Signed-off-by: Bernd Verst <[email protected]> * Pin Go 1.22.2 Signed-off-by: Bernd Verst <[email protected]> * Fix makefile Signed-off-by: Bernd Verst <[email protected]> * revert makefile changes Signed-off-by: Bernd Verst <[email protected]> * Update all go.mod/Makefile/Dockerfile for `1.22`. Remove `{}` chars from HTTP route fuzz generations. Signed-off-by: joshvanl <[email protected]> * Makefile: export `go/bin` to PATH for darwin Exports the `go/bin/darwin_$(arch)` directory to the PATH environment variable when running on Darwin. This ensures that binaries installed by `go install` are available in the Makefile exec path. Signed-off-by: joshvanl <[email protected]> --------- Signed-off-by: Bernd Verst <[email protected]> Signed-off-by: joshvanl <[email protected]> Co-authored-by: joshvanl <[email protected]> Signed-off-by: Elena Kolevska <[email protected]>
1 parent bc812d2 commit 5ecba7e

File tree

35 files changed

+147
-153
lines changed

35 files changed

+147
-153
lines changed

‎.build-tools/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module build-tools
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
github.com/google/go-containerregistry v0.11.1-0.20220802162123-c1f9836a4fa9

‎Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ ifeq ($(LOCAL_OS),Linux)
8484
TARGET_OS_LOCAL = linux
8585
else ifeq ($(LOCAL_OS),Darwin)
8686
TARGET_OS_LOCAL = darwin
87+
PATH := $(PATH):$(HOME)/go/bin/darwin_$(GOARCH)
8788
else
8889
TARGET_OS_LOCAL = windows
8990
PROTOC_GEN_GO_NAME := "protoc-gen-go.exe"
@@ -405,7 +406,7 @@ MODFILES := $(shell find . -name go.mod)
405406
define modtidy-target
406407
.PHONY: modtidy-$(1)
407408
modtidy-$(1):
408-
cd $(shell dirname $(1)); CGO_ENABLED=$(CGO) go mod tidy -compat=1.21; cd -
409+
cd $(shell dirname $(1)); CGO_ENABLED=$(CGO) go mod tidy -compat=1.22; cd -
409410
endef
410411

411412
# Generate modtidy target action for each go.mod file

‎docker/Dockerfile-debug‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# current directory must be ./dist
22

3-
FROM golang:1.21
3+
FROM golang:1.22
44

55
ARG PKG_FILES
66
RUN go install github.com/go-delve/delve/cmd/dlv@latest

‎docker/Dockerfile-dev‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Based on https://github.com/microsoft/vscode-dev-containers/tree/v0.224.3/containers/go/.devcontainer/base.Dockerfile
22

3-
# [Choice] Go version: 1, 1.21, etc
4-
ARG GOVERSION=1.21
3+
# [Choice] Go version: 1, 1.22, etc
4+
ARG GOVERSION=1.22
55
FROM golang:${GOVERSION}-bullseye
66

77
# [Option] Install zsh

‎docker/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ This includes dockerfiles to build Dapr release and debug images and development
1212

1313
The Dev Container can be rebuilt with custom options. Relevant args (and their default values) include:
1414

15-
* `GOVERSION` (default: `1.21`)
15+
* `GOVERSION` (default: `1.22`)
1616
* `INSTALL_ZSH` (default: `true`)
1717
* `KUBECTL_VERSION` (default: `latest`)
1818
* `HELM_VERSION` (default: `latest`)

‎docs/development/setup-dapr-development-env.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ This document helps you get started developing Dapr. If you find any problems wh
2323
2424
## Go (Golang)
2525
26-
1. Download and install [Go 1.21 or later](https://golang.org/doc/install#tarball).
26+
1. Download and install [Go 1.22 or later](https://golang.org/doc/install#tarball).
2727
2828
2. Install [Delve](https://github.com/go-delve/delve/tree/master/Documentation/installation) for Go debugging, if desired.
2929

‎go.mod‎

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/dapr/dapr
22

3-
go 1.21
4-
5-
toolchain go1.21.4
3+
go 1.22.2
64

75
require (
86
contrib.go.opencensus.io/exporter/prometheus v0.4.2
@@ -12,7 +10,7 @@ require (
1210
github.com/argoproj/argo-rollouts v1.4.1
1311
github.com/cenkalti/backoff/v4 v4.2.1
1412
github.com/cloudevents/sdk-go/v2 v2.14.0
15-
github.com/dapr/components-contrib v1.13.0-rc.10
13+
github.com/dapr/components-contrib v1.13.0-rc.2.0.20240503231149-1f46231d875c
1614
github.com/dapr/kit v0.13.1-0.20240402103809-0c7cfce53d9e
1715
github.com/evanphx/json-patch/v5 v5.8.1
1816
github.com/go-chi/chi/v5 v5.0.11
@@ -48,7 +46,7 @@ require (
4846
github.com/spf13/cast v1.6.0
4947
github.com/spf13/pflag v1.0.5
5048
github.com/spiffe/go-spiffe/v2 v2.1.6
51-
github.com/stretchr/testify v1.8.4
49+
github.com/stretchr/testify v1.9.0
5250
github.com/valyala/fasthttp v1.51.0
5351
go.mongodb.org/mongo-driver v1.12.1
5452
go.opencensus.io v0.24.0
@@ -61,9 +59,9 @@ require (
6159
go.opentelemetry.io/otel/trace v1.21.0
6260
go.uber.org/automaxprocs v1.5.3
6361
go.uber.org/ratelimit v0.3.0
64-
golang.org/x/crypto v0.19.0
62+
golang.org/x/crypto v0.22.0
6563
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a
66-
golang.org/x/net v0.21.0
64+
golang.org/x/net v0.24.0
6765
golang.org/x/sync v0.6.0
6866
google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f
6967
google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0
@@ -100,23 +98,23 @@ require (
10098
github.com/AthenZ/athenz v1.10.39 // indirect
10199
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // indirect
102100
github.com/Azure/azure-sdk-for-go/sdk/ai/azopenai v0.3.0 // indirect
103-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1 // indirect
104-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1 // indirect
101+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 // indirect
102+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.2 // indirect
105103
github.com/Azure/azure-sdk-for-go/sdk/data/azappconfig v1.1.0 // indirect
106-
github.com/Azure/azure-sdk-for-go/sdk/data/azcosmos v0.3.6 // indirect
104+
github.com/Azure/azure-sdk-for-go/sdk/data/azcosmos v1.0.1 // indirect
107105
github.com/Azure/azure-sdk-for-go/sdk/data/aztables v1.1.0 // indirect
108-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1 // indirect
109-
github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs v1.0.3 // indirect
110-
github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus v1.6.0 // indirect
106+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.7.0 // indirect
107+
github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs v1.1.0 // indirect
108+
github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus v1.7.0 // indirect
111109
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/eventgrid/armeventgrid/v2 v2.2.0 // indirect
112110
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/eventhub/armeventhub v1.2.0 // indirect
113-
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.0.1 // indirect
114-
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets v1.0.1 // indirect
111+
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.1.0 // indirect
112+
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets v1.1.0 // indirect
115113
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0 // indirect
116-
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.1 // indirect
114+
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.2 // indirect
117115
github.com/Azure/azure-sdk-for-go/sdk/storage/azqueue v1.0.0 // indirect
118-
github.com/Azure/go-amqp v1.0.5-0.20240301200753-2dff4b36f85f // indirect
119-
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 // indirect
116+
github.com/Azure/go-amqp v1.0.5 // indirect
117+
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
120118
github.com/DataDog/zstd v1.5.2 // indirect
121119
github.com/IBM/sarama v1.42.2 // indirect
122120
github.com/OneOfOne/xxhash v1.2.8 // indirect
@@ -151,8 +149,8 @@ require (
151149
github.com/armon/go-metrics v0.4.1 // indirect
152150
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
153151
github.com/aws/aws-msk-iam-sasl-signer-go v1.0.0 // indirect
154-
github.com/aws/aws-sdk-go v1.45.19 // indirect
155-
github.com/aws/aws-sdk-go-v2 v1.19.0 // indirect
152+
github.com/aws/aws-sdk-go v1.50.19 // indirect
153+
github.com/aws/aws-sdk-go-v2 v1.25.0 // indirect
156154
github.com/aws/aws-sdk-go-v2/config v1.18.28 // indirect
157155
github.com/aws/aws-sdk-go-v2/credentials v1.13.27 // indirect
158156
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.5 // indirect
@@ -163,7 +161,7 @@ require (
163161
github.com/aws/aws-sdk-go-v2/service/sso v1.12.13 // indirect
164162
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.13 // indirect
165163
github.com/aws/aws-sdk-go-v2/service/sts v1.19.3 // indirect
166-
github.com/aws/smithy-go v1.13.5 // indirect
164+
github.com/aws/smithy-go v1.20.0 // indirect
167165
github.com/awslabs/kinesis-aggregation/go v0.0.0-20210630091500-54e17340d32f // indirect
168166
github.com/aymerick/douceur v0.2.0 // indirect
169167
github.com/benbjohnson/clock v1.3.5 // indirect
@@ -177,12 +175,12 @@ require (
177175
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
178176
github.com/cespare/xxhash/v2 v2.2.0 // indirect
179177
github.com/chebyrash/promise v0.0.0-20230709133807-42ec49ba1459 // indirect
180-
github.com/chenzhuoyu/iasm v0.9.0 // indirect
181-
github.com/choleraehyq/pid v0.0.17 // indirect
178+
github.com/chenzhuoyu/iasm v0.9.1 // indirect
179+
github.com/choleraehyq/pid v0.0.18 // indirect
182180
github.com/clbanning/mxj/v2 v2.5.6 // indirect
183181
github.com/cloudevents/sdk-go/binding/format/protobuf/v2 v2.14.0 // indirect
184182
github.com/cloudwego/fastpb v0.0.4-0.20230131074846-6fc453d58b96 // indirect
185-
github.com/cloudwego/frugal v0.1.8 // indirect
183+
github.com/cloudwego/frugal v0.1.14 // indirect
186184
github.com/cloudwego/kitex v0.5.0 // indirect
187185
github.com/cloudwego/netpoll v0.3.2 // indirect
188186
github.com/cloudwego/thriftgo v0.3.0 // indirect
@@ -235,10 +233,10 @@ require (
235233
github.com/goccy/go-json v0.10.2 // indirect
236234
github.com/gocql/gocql v1.5.2 // indirect
237235
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
238-
github.com/gofrs/uuid v3.3.0+incompatible // indirect
236+
github.com/gofrs/uuid v4.4.0+incompatible // indirect
239237
github.com/gogo/protobuf v1.3.2 // indirect
240238
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
241-
github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
239+
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
242240
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
243241
github.com/golang-sql/sqlexp v0.1.0 // indirect
244242
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -269,7 +267,7 @@ require (
269267
github.com/hashicorp/golang-lru v1.0.2 // indirect
270268
github.com/hashicorp/serf v0.10.1 // indirect
271269
github.com/hazelcast/hazelcast-go-client v0.0.0-20190530123621-6cf767c2f31a // indirect
272-
github.com/http-wasm/http-wasm-host-go v0.5.1 // indirect
270+
github.com/http-wasm/http-wasm-host-go v0.6.0 // indirect
273271
github.com/huaweicloud/huaweicloud-sdk-go-obs v3.23.4+incompatible // indirect
274272
github.com/huaweicloud/huaweicloud-sdk-go-v3 v0.1.56 // indirect
275273
github.com/imdario/mergo v0.3.16 // indirect
@@ -367,12 +365,12 @@ require (
367365
github.com/spf13/cobra v1.8.0 // indirect
368366
github.com/stealthrocket/wasi-go v0.8.1-0.20230912180546-8efbab50fb58 // indirect
369367
github.com/stoewer/go-strcase v1.2.0 // indirect
370-
github.com/stretchr/objx v0.5.0 // indirect
368+
github.com/stretchr/objx v0.5.2 // indirect
371369
github.com/supplyon/gremcos v0.1.40 // indirect
372370
github.com/tchap/go-patricia/v2 v2.3.1 // indirect
373371
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.732 // indirect
374372
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssm v1.0.732 // indirect
375-
github.com/tetratelabs/wazero v1.5.0 // indirect
373+
github.com/tetratelabs/wazero v1.7.0 // indirect
376374
github.com/tidwall/gjson v1.13.0 // indirect
377375
github.com/tidwall/match v1.1.1 // indirect
378376
github.com/tidwall/pretty v1.2.1 // indirect
@@ -406,8 +404,8 @@ require (
406404
golang.org/x/arch v0.3.0 // indirect
407405
golang.org/x/mod v0.14.0 // indirect
408406
golang.org/x/oauth2 v0.16.0 // indirect
409-
golang.org/x/sys v0.17.0 // indirect
410-
golang.org/x/term v0.17.0 // indirect
407+
golang.org/x/sys v0.19.0 // indirect
408+
golang.org/x/term v0.19.0 // indirect
411409
golang.org/x/text v0.14.0 // indirect
412410
golang.org/x/time v0.3.0 // indirect
413411
golang.org/x/tools v0.17.0 // indirect

0 commit comments

Comments
 (0)