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

Update googleapi go dependencies to remove usage of deprecated modules #582

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update googleapi go dependencies to remove usage of deprecated modules #582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc7283f
Update googleapi go dependencies to remove usage of deprecated modules
bentekkie Jun 5, 2024
cb73c18
Merge branch 'bazelbuild:master' into fixgoogleapis
bentekkie Jun 5, 2024
5b82556
Fix errgroup ctx
bentekkie Jun 5, 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
47 changes: 26 additions & 21 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

http_archive(
name = "io_bazel_rules_go",
sha256 = "6b65cb7917b4d1709f9410ffe00ecf3e160edf674b78c54a894471320862184f",
sha256 = "278b7ff5a826f3dc10f04feaf0b70d48b68748ccd512d7f98bf442077f043fe3",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.39.0/rules_go-v0.39.0.zip",
"https://github.com/bazelbuild/rules_go/releases/download/v0.39.0/rules_go-v0.39.0.zip",
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip",
"https://github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip",
],
)

http_archive(
name = "bazel_gazelle",
sha256 = "727f3e4edd96ea20c29e8c2ca9e8d2af724d8c7778e7923a854b2c80952bc405",
sha256 = "29218f8e0cebe583643cbf93cae6f971be8a2484cdcfa1e45057658df8d54002",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.30.0/bazel-gazelle-v0.30.0.tar.gz",
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.30.0/bazel-gazelle-v0.30.0.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.32.0/bazel-gazelle-v0.32.0.tar.gz",
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.32.0/bazel-gazelle-v0.32.0.tar.gz",
],
)

Expand All @@ -30,29 +30,28 @@ go_register_toolchains(version = "1.20.7")
# Need "build_file_proto_mode" argument.
go_repository(
name = "org_golang_google_grpc",
build_file_proto_mode = "disable",
importpath = "google.golang.org/grpc",
commit = "7aceafcc52f95f31da11dabb4eb4b1803364a9bb"
sum = "h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY=",
version = "v1.64.0",
)

# Need "build_file_proto_mode" argument.
go_repository(
name = "org_golang_google_api",
build_file_proto_mode = "disable",
importpath = "google.golang.org/api",
sum = "h1:zDobeejm3E7pEG1mNHvdxvjs5XJoCMzyNH+CmwL94Es=",
version = "v0.122.0",
sum = "h1:PNMeRDwo1pJdgNcFQ9GstuLe/noWKIc89pRWRLMvLwE=",
version = "v0.183.0",
)

# Insert go_repository rules before this one to override specific deps.
gazelle_dependencies()

# Insert oauth2 before remote_apis_sdks_deps() to override version
go_repository(
name = "org_golang_x_oauth2",
importpath = "golang.org/x/oauth2",
sum = "h1:4mQdhULixXKP1rwYBW0vAijoXnkTG0BLCDRzfe1idMo=",
version = "v0.20.0",
name = "org_golang_x_oauth2",
importpath = "golang.org/x/oauth2",
sum = "h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=",
version = "v0.21.0",
)

load("//:go_deps.bzl", "remote_apis_sdks_go_deps")
Expand Down Expand Up @@ -93,17 +92,23 @@ grpc_deps()
# Needed for the googleapis protos used by com_github_bazelbuild_remote_apis below.
http_archive(
name = "googleapis",
build_file = "BUILD.googleapis",
sha256 = "7b6ea252f0b8fb5cd722f45feb83e115b689909bbb6a393a873b6cbad4ceae1d",
strip_prefix = "googleapis-143084a2624b6591ee1f9d23e7f5241856642f4d",
urls = ["https://github.com/googleapis/googleapis/archive/143084a2624b6591ee1f9d23e7f5241856642f4d.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")

switched_rules_by_language(
name = "com_google_googleapis_imports",
)

go_repository(
name = "com_github_bazelbuild_remote_apis",
importpath = "github.com/bazelbuild/remote-apis",
sum = "h1:Lj8uXWW95oXyYguUSdQDvzywQb4f0jbJWsoLPQWAKTY=",
version = "v0.0.0-20230411132548-35aee1c4a425",
replace = "github.com/bentekkie/remote-apis",
sum = "h1:HQRzfdwOBeFbSK0vO8ZfSaqLhKKOJDOMF62bFfggwJ8=",
version = "v0.0.0-20240605144600-b36ef32b88ff",
)

load("@com_github_bazelbuild_remote_apis//:remote_apis_deps.bzl", "remote_apis_go_deps")
Expand Down
38 changes: 19 additions & 19 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,29 @@ module github.com/bazelbuild/remote-apis-sdks
go 1.20

require (
github.com/bazelbuild/remote-apis v0.0.0-20230411132548-35aee1c4a425
github.com/golang/glog v1.1.0
github.com/google/go-cmp v0.5.9
github.com/google/uuid v1.3.0
cloud.google.com/go/longrunning v0.5.7
github.com/bazelbuild/remote-apis v0.0.0-20240409135018-1f36c310b28d
github.com/golang/glog v1.2.0
github.com/google/go-cmp v0.6.0
github.com/google/uuid v1.6.0
github.com/hectane/go-acl v0.0.0-20230122075934-ca0b05cb1adb
github.com/klauspost/compress v1.17.8
github.com/pkg/xattr v0.4.4
golang.org/x/oauth2 v0.20.0
golang.org/x/sync v0.6.0
google.golang.org/api v0.126.0
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5
google.golang.org/genproto/googleapis/bytestream v0.0.0-20230807174057-1744710a1577
google.golang.org/genproto/googleapis/rpc v0.0.0-20230731190214-cbb8c96f2d6d
google.golang.org/grpc v1.58.0-dev.0.20230804151048-7aceafcc52f9
google.golang.org/protobuf v1.33.0
github.com/pkg/xattr v0.4.9
golang.org/x/oauth2 v0.21.0
golang.org/x/sync v0.7.0
google.golang.org/api v0.183.0
google.golang.org/genproto/googleapis/bytestream v0.0.0-20240528184218-531527333157
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157
google.golang.org/grpc v1.64.0
google.golang.org/protobuf v1.34.1
)

replace github.com/bazelbuild/remote-apis v0.0.0-20240409135018-1f36c310b28d => github.com/bentekkie/remote-apis v0.0.0-20240605144600-b36ef32b88ff

require (
cloud.google.com/go/compute/metadata v0.3.0 // indirect
cloud.google.com/go/longrunning v0.5.1 // indirect
github.com/golang/protobuf v1.5.3 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/sys v0.20.0 // indirect
golang.org/x/text v0.15.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240521202816-d264139d666e // indirect
)
Loading
Loading