Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update go dependencies to remove use of deprecated googleapi go modules #298

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update go dependencies to remove use of deprecated googleapi go modules #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b36ef32
Update go dependencies to remove use of deprecated longrunningpb target
bentekkie Jun 5, 2024
e875e36
Remove accidentally included files
bentekkie Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ remote_apis_go_deps()
# Needed for the googleapis protos.
http_archive(
name = "googleapis",
sha256 = "b28c13e99001664eac5f1fb81b44d912d19fbc041e30772263251da131f6573c",
strip_prefix = "googleapis-bb964feba5980ed70c9fb8f84fe6e86694df65b0",
urls = ["https://github.com/googleapis/googleapis/archive/bb964feba5980ed70c9fb8f84fe6e86694df65b0.zip"],
sha256 = "89de2bb5c5a1e2ff1a1791de19686d54507e971b849efe49f7bdd188521062c5",
strip_prefix = "googleapis-46bc6f2d612c42644f061b4c22eedd762cd72909",
urls = ["https://github.com/googleapis/googleapis/archive/46bc6f2d612c42644f061b4c22eedd762cd72909.zip"],
)

load("@googleapis//:repository_rules.bzl", "switched_rules_by_language")
Expand Down
4 changes: 2 additions & 2 deletions build/bazel/remote/asset/v1/go/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ go_proto_library(
proto = "//build/bazel/remote/asset/v1:remote_asset_proto",
deps = [
"//build/bazel/remote/execution/v2:remote_execution_go_proto",
"@org_golang_google_genproto//googleapis/api/annotations",
"@org_golang_google_genproto//googleapis/rpc/status",
"@org_golang_google_genproto_googleapis_api//annotations",
"@org_golang_google_genproto_googleapis_rpc//status",
],
)

Expand Down
213 changes: 169 additions & 44 deletions build/bazel/remote/asset/v1/remote_asset.pb.go
100644 → 100755
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions build/bazel/remote/execution/v2/go/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ go_proto_library(
proto = "//build/bazel/remote/execution/v2:remote_execution_proto",
deps = [
"//build/bazel/semver:semver_go_proto",
"@org_golang_google_genproto//googleapis/api/annotations",
"@org_golang_google_genproto//googleapis/longrunning",
"@org_golang_google_genproto//googleapis/rpc/status",
"@com_google_cloud_go_longrunning//autogen/longrunningpb",
"@org_golang_google_genproto_googleapis_api//annotations",
"@org_golang_google_genproto_googleapis_rpc//status",
],
)

Expand Down
1,094 changes: 567 additions & 527 deletions build/bazel/remote/execution/v2/remote_execution.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 5 additions & 6 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ module github.com/bazelbuild/remote-apis
go 1.12

require (
github.com/golang/protobuf v1.5.2
golang.org/x/net v0.0.0-20210505214959-0714010a04ed // indirect
golang.org/x/sys v0.0.0-20210507014357-30e306a8bba5 // indirect
google.golang.org/genproto v0.0.0-20210506142907-4a47615972c2
google.golang.org/grpc v1.37.0
google.golang.org/protobuf v1.26.0
cloud.google.com/go/longrunning v0.5.7
google.golang.org/genproto/googleapis/api v0.0.0-20240429193739-8cf5692501f6
google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6
google.golang.org/grpc v1.63.2
google.golang.org/protobuf v1.34.0
)
2,673 changes: 2,661 additions & 12 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

42 changes: 18 additions & 24 deletions remote_apis_deps.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,22 @@ def remote_apis_go_deps():

# The version of this repo needs to be in sync with @googleapis
go_repository(
name = "org_golang_google_genproto",
build_extra_args = ["-exclude=vendor"],
build_file_generation = "on",
build_file_proto_mode = "disable_global",
importpath = "google.golang.org/genproto",
sum = "h1:S9GbmC1iCgvbLyAokVCwiO6tVIrU9Y7c5oMx1V/ki/Y=",
version = "v0.0.0-20221024183307-1bc688fe9f3e",
name = "org_golang_google_genproto_googleapis_api",
importpath = "google.golang.org/genproto/googleapis/api",
sum = "h1:DTJM0R8LECCgFeUwApvcEJHz85HLagW8uRENYxHh1ww=",
version = "v0.0.0-20240429193739-8cf5692501f6",
)
go_repository(
name = "org_golang_google_genproto_googleapis_rpc",
importpath = "google.golang.org/genproto/googleapis/rpc",
sum = "h1:DujSIu+2tC9Ht0aPNA7jgj23Iq8Ewi5sgkQ++wdvonE=",
version = "v0.0.0-20240429193739-8cf5692501f6",
)
go_repository(
name = "com_google_cloud_go_longrunning",
importpath = "cloud.google.com/go/longrunning",
sum = "h1:WLbHekDbjK1fVFD3ibpFFVoyizlLRl73I7YKuAKilhU=",
version = "v0.5.7",
)

go_rules_dependencies()
Expand All @@ -29,27 +38,12 @@ def remote_apis_go_deps():
go_repository,
name = "com_github_golang_protobuf",
importpath = "github.com/golang/protobuf",
tag = "v1.3.2",
tag = "v1.34.0",
)
_maybe(
go_repository,
name = "org_golang_google_grpc",
build_file_proto_mode = "disable",
importpath = "google.golang.org/grpc",
sum = "h1:uSZWeQJX5j11bIQ4AJoj+McDBo29cY1MCoC1wO3ts+c=",
version = "v1.37.0",
)
_maybe(
go_repository,
name = "org_golang_x_net",
importpath = "golang.org/x/net",
sum = "h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628=",
version = "v0.0.0-20190311183353-d8887717615a",
)
_maybe(
go_repository,
name = "org_golang_x_text",
importpath = "golang.org/x/text",
sum = "h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=",
version = "v0.3.0",
version = "v1.63.2",
)