Skip to content

Commit bcc09e4

Browse files
authored
Update cloud.google.com/go/compute to v1.36.1 (#57)
``` bazelisk run @rules_go//go -- get cloud.google.com/go/compute@v1.36.1 bazelisk run @rules_go//go -- get mod tidy ``` This required upgrading go sdk to 1.23.0 There was an issue with github.com/envoyproxy/protoc-gen-validate: gazelle failed to generate correct build file. Fixed by adding gazelle_override suggested by the following issue: bazel-contrib/bazel-gazelle#1980 There were another issue on osx host version, which was fixed by setting minos version. cc @privacywill
1 parent 9c9bb11 commit bcc09e4

File tree

5 files changed

+189
-223
lines changed

5 files changed

+189
-223
lines changed

.bazelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
common --enable_bzlmod
2+
build --host_macos_minimum_os=13.3
3+
build --macos_minimum_os=13.3
4+
build --apple_platform_type=macos

MODULE.bazel

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ bazel_dep(name = "gazelle", version = "0.40.0")
7373
go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
7474
go_sdk.download(
7575
name = "go_sdk",
76-
version = "1.22.0",
76+
version = "1.23.0",
7777
)
7878
use_repo(go_sdk, "go_sdk")
7979

@@ -91,6 +91,13 @@ go_deps.gazelle_default_attributes(
9191
"gazelle:proto disable",
9292
],
9393
)
94+
go_deps.gazelle_override(
95+
build_file_generation = "clean",
96+
directives = [
97+
"gazelle:build_file_name BUILD.bazel",
98+
],
99+
path = "github.com/envoyproxy/protoc-gen-validate",
100+
)
94101
use_repo(
95102
go_deps,
96103
"com_github_apache_thrift",
@@ -107,7 +114,6 @@ use_repo(
107114
"io_k8s_api",
108115
"io_k8s_apimachinery",
109116
"io_k8s_client_go",
110-
"org_golang_google_genproto",
111117
"org_golang_google_protobuf",
112118
)
113119

app/api/biz/service/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ go_library(
88
deps = [
99
"//app/api/biz/dal/db",
1010
"//app/api/biz/model/job",
11-
"//app/api/biz/pkg/storage",
1211
"//app/api/biz/pkg/errno",
12+
"//app/api/biz/pkg/storage",
1313
"@com_github_cloudwego_hertz//pkg/common/hlog",
1414
"@com_github_google_uuid//:uuid",
1515
"@com_github_pkg_errors//:errors",

go.mod

Lines changed: 51 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
module github.com/manatee-project/manatee
22

3-
go 1.22.0
3+
go 1.23.0
44

55
require (
6-
cloud.google.com/go/compute v1.25.1
7-
cloud.google.com/go/iam v1.1.8
8-
cloud.google.com/go/storage v1.41.0
6+
cloud.google.com/go/compute v1.36.1
7+
cloud.google.com/go/iam v1.4.0
8+
cloud.google.com/go/storage v1.50.0
99
github.com/apache/thrift v0.13.0
10-
github.com/cloudwego/hertz v0.9.0
10+
github.com/cloudwego/hertz v0.9.7
1111
github.com/gin-gonic/gin v1.10.0
1212
github.com/google/uuid v1.6.0
1313
github.com/minio/minio-go/v7 v7.0.81
1414
github.com/pkg/errors v0.9.1
15-
google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda
16-
google.golang.org/protobuf v1.34.2
15+
google.golang.org/protobuf v1.36.6
1716
gorm.io/driver/mysql v1.5.6
1817
gorm.io/gorm v1.25.10
1918
k8s.io/api v0.31.3
@@ -22,20 +21,27 @@ require (
2221
)
2322

2423
require (
25-
cloud.google.com/go v0.113.0 // indirect
26-
cloud.google.com/go/auth v0.4.1 // indirect
27-
cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
28-
cloud.google.com/go/compute/metadata v0.3.0 // indirect
29-
github.com/bytedance/go-tagexpr/v2 v2.9.2 // indirect
30-
github.com/bytedance/gopkg v0.0.0-20220413063733-65bf48ffb3a7 // indirect
31-
github.com/bytedance/sonic v1.11.6 // indirect
32-
github.com/bytedance/sonic/loader v0.1.1 // indirect
33-
github.com/cloudwego/base64x v0.1.4 // indirect
34-
github.com/cloudwego/iasm v0.2.0 // indirect
35-
github.com/cloudwego/netpoll v0.5.0 // indirect
24+
cel.dev/expr v0.19.2 // indirect
25+
cloud.google.com/go v0.120.0 // indirect
26+
cloud.google.com/go/auth v0.16.0 // indirect
27+
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
28+
cloud.google.com/go/compute/metadata v0.6.0 // indirect
29+
cloud.google.com/go/monitoring v1.24.0 // indirect
30+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0 // indirect
31+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.50.0 // indirect
32+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.50.0 // indirect
33+
github.com/bytedance/gopkg v0.1.0 // indirect
34+
github.com/bytedance/sonic v1.13.2 // indirect
35+
github.com/bytedance/sonic/loader v0.2.4 // indirect
36+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
37+
github.com/cloudwego/base64x v0.1.5 // indirect
38+
github.com/cloudwego/netpoll v0.6.4 // indirect
39+
github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 // indirect
3640
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3741
github.com/dustin/go-humanize v1.0.1 // indirect
3842
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
43+
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
44+
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
3945
github.com/felixge/httpsnoop v1.0.4 // indirect
4046
github.com/fsnotify/fsnotify v1.7.0 // indirect
4147
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
@@ -53,16 +59,13 @@ require (
5359
github.com/go-sql-driver/mysql v1.7.0 // indirect
5460
github.com/goccy/go-json v0.10.3 // indirect
5561
github.com/gogo/protobuf v1.3.2 // indirect
56-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5762
github.com/golang/protobuf v1.5.4 // indirect
5863
github.com/google/gnostic-models v0.6.8 // indirect
59-
github.com/google/go-cmp v0.6.0 // indirect
64+
github.com/google/go-cmp v0.7.0 // indirect
6065
github.com/google/gofuzz v1.2.0 // indirect
61-
github.com/google/s2a-go v0.1.7 // indirect
62-
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
63-
github.com/googleapis/gax-go/v2 v2.12.4 // indirect
64-
github.com/henrylee2cn/ameda v1.4.10 // indirect
65-
github.com/henrylee2cn/goutil v0.0.0-20210127050712-89660552f6f8 // indirect
66+
github.com/google/s2a-go v0.1.9 // indirect
67+
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
68+
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
6669
github.com/jinzhu/inflection v1.0.0 // indirect
6770
github.com/jinzhu/now v1.1.5 // indirect
6871
github.com/josharian/intern v1.0.0 // indirect
@@ -78,32 +81,37 @@ require (
7881
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7982
github.com/nyaruka/phonenumbers v1.0.55 // indirect
8083
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
84+
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
8185
github.com/rs/xid v1.6.0 // indirect
8286
github.com/tidwall/gjson v1.14.4 // indirect
8387
github.com/tidwall/match v1.1.1 // indirect
8488
github.com/tidwall/pretty v1.2.0 // indirect
8589
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
8690
github.com/ugorji/go/codec v1.2.12 // indirect
8791
github.com/x448/float16 v0.8.4 // indirect
88-
go.opencensus.io v0.24.0 // indirect
89-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
90-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
91-
go.opentelemetry.io/otel v1.24.0 // indirect
92-
go.opentelemetry.io/otel/metric v1.24.0 // indirect
93-
go.opentelemetry.io/otel/trace v1.24.0 // indirect
92+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
93+
go.opentelemetry.io/contrib/detectors/gcp v1.34.0 // indirect
94+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
95+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
96+
go.opentelemetry.io/otel v1.35.0 // indirect
97+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
98+
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
99+
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
100+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
94101
golang.org/x/arch v0.8.0 // indirect
95-
golang.org/x/crypto v0.28.0 // indirect
96-
golang.org/x/net v0.30.0 // indirect
97-
golang.org/x/oauth2 v0.21.0 // indirect
98-
golang.org/x/sync v0.8.0 // indirect
99-
golang.org/x/sys v0.26.0 // indirect
100-
golang.org/x/term v0.25.0 // indirect
101-
golang.org/x/text v0.19.0 // indirect
102-
golang.org/x/time v0.5.0 // indirect
103-
google.golang.org/api v0.180.0 // indirect
104-
google.golang.org/genproto/googleapis/api v0.0.0-20240513163218-0867130af1f8 // indirect
105-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240509183442-62759503f434 // indirect
106-
google.golang.org/grpc v1.63.2 // indirect
102+
golang.org/x/crypto v0.37.0 // indirect
103+
golang.org/x/net v0.39.0 // indirect
104+
golang.org/x/oauth2 v0.29.0 // indirect
105+
golang.org/x/sync v0.13.0 // indirect
106+
golang.org/x/sys v0.32.0 // indirect
107+
golang.org/x/term v0.31.0 // indirect
108+
golang.org/x/text v0.24.0 // indirect
109+
golang.org/x/time v0.11.0 // indirect
110+
google.golang.org/api v0.229.0 // indirect
111+
google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb // indirect
112+
google.golang.org/genproto/googleapis/api v0.0.0-20250414145226-207652e42e2e // indirect
113+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250414145226-207652e42e2e // indirect
114+
google.golang.org/grpc v1.71.1 // indirect
107115
gopkg.in/inf.v0 v0.9.1 // indirect
108116
gopkg.in/yaml.v2 v2.4.0 // indirect
109117
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)