Skip to content

chore: update googleapis SHA circa 2025-03-24 #15047

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

Merged
scotthart merged 4 commits into from
Mar 24, 2025
Merged

chore: update googleapis SHA circa 2025-03-24 #15047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5ba85ee
chore: update googleapis SHA circa 2025-03-24
scotthart Mar 24, 2025
9afcba9
update module patch file
scotthart Mar 24, 2025
3cf3804
Update the protodeps/protolists
scotthart Mar 24, 2025
04f8afb
Regenerate libraries
scotthart Mar 24, 2025
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 MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ python.toolchain(
bazel_dep(name = "googleapis", version = "0.0.0", repo_name = "com_google_googleapis")
archive_override(
module_name = "googleapis",
integrity = "sha256-MZPa3PizBRb1hnXh4y5EBJCnMOi00SFoYT3/LeXfv4M=",
integrity = "sha256-KnunCHPK1T8u8SUxAAU122G6qmfxADIfA4ZU+fNWXjY=",
patch_strip = 1,
patches = ["//bazel:googleapis.modules.patch"],
strip_prefix = "googleapis-732dbc81f7dff6e93c5acb45887561a1dc3018d0",
strip_prefix = "googleapis-53ca65d540dd1a7cb4746687daa87208dc9ea437",
urls = [
"https://github.com/googleapis/googleapis/archive/732dbc81f7dff6e93c5acb45887561a1dc3018d0.tar.gz",
"https://github.com/googleapis/googleapis/archive/53ca65d540dd1a7cb4746687daa87208dc9ea437.tar.gz",
],
)

Expand Down
26 changes: 21 additions & 5 deletions bazel/googleapis.modules.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,33 @@
diff --git a/BUILD.bazel b/BUILD.bazel
index 95e4c12e5..a901fd573 100644
index 026553f5c7..f3c6b6925c 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -1,3 +1,7 @@
@@ -1,11 +1,13 @@
+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"]) # Apache 2.0
+
genrule(
name = "build_gen",
outs = ["build_gen.sh"],
@@ -16,3 +20,15 @@ EOD
- name = "build_gen",
- srcs = glob(
- ["run_build_gen.sh"],
- allow_empty = True,
- ),
- outs = ["build_gen.sh"],
- cmd = """
+ name = "build_gen",
+ outs = ["build_gen.sh"],
+ executable = True,
+ srcs = glob(["run_build_gen.sh"], allow_empty=True),
+ cmd = """
if test -z \"$(SRCS)\"; then
cat <<EOD > $@
#!/bin/sh
@@ -17,5 +19,17 @@ EOD
cp $(SRCS) $@
fi
""",
- executable = True,
)
+
+# This build file overlays on top of the BUILD files for the googleapis repo,
Expand All @@ -26,6 +41,7 @@ index 95e4c12e5..a901fd573 100644
+ ".",
+ ],
+)
+
diff --git a/MODULE.bazel b/MODULE.bazel
new file mode 100644
index 000000000..169133e43
Expand Down
6 changes: 3 additions & 3 deletions bazel/workspace0.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,10 @@ def gl_cpp_workspace0(name = None):
http_archive,
name = "com_google_googleapis",
urls = [
"https://github.com/googleapis/googleapis/archive/732dbc81f7dff6e93c5acb45887561a1dc3018d0.tar.gz",
"https://github.com/googleapis/googleapis/archive/53ca65d540dd1a7cb4746687daa87208dc9ea437.tar.gz",
],
sha256 = "3193dadcf8b30516f58675e1e32e440490a730e8b4d12168613dff2de5dfbf83",
strip_prefix = "googleapis-732dbc81f7dff6e93c5acb45887561a1dc3018d0",
sha256 = "2a7ba70873cad53f2ef12531000535db61baaa67f100321f038654f9f3565e36",
strip_prefix = "googleapis-53ca65d540dd1a7cb4746687daa87208dc9ea437",
build_file = Label("//bazel:googleapis.BUILD"),
# Scaffolding for patching googleapis after download. For example:
# patches = ["googleapis.patch"]
Expand Down
4 changes: 2 additions & 2 deletions cmake/GoogleapisConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ set(GOOGLE_CLOUD_CPP_GOOGLEAPIS_SHA256
mark_as_advanced(GOOGLE_CLOUD_CPP_GOOGLEAPIS_SHA256)

set(_GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA
"732dbc81f7dff6e93c5acb45887561a1dc3018d0")
"53ca65d540dd1a7cb4746687daa87208dc9ea437")
set(_GOOGLE_CLOUD_CPP_GOOGLEAPIS_SHA256
"3193dadcf8b30516f58675e1e32e440490a730e8b4d12168613dff2de5dfbf83")
"2a7ba70873cad53f2ef12531000535db61baaa67f100321f038654f9f3565e36")

set(DOXYGEN_ALIASES
"googleapis_link{2}=\"[\\1](https://github.com/googleapis/googleapis/blob/${_GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA}/\\2)\""
Expand Down
1 change: 1 addition & 0 deletions external/googleapis/protodeps/networkconnectivity.deps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@
@com_google_googleapis//google/api:launch_stage_proto
@com_google_googleapis//google/api:resource_proto
@com_google_googleapis//google/longrunning:operations_proto
@com_google_googleapis//google/rpc:error_details_proto
@com_google_googleapis//google/rpc:status_proto
1 change: 1 addition & 0 deletions external/googleapis/protolists/networkconnectivity.list
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@com_google_googleapis//google/cloud/networkconnectivity/v1:common.proto
@com_google_googleapis//google/cloud/networkconnectivity/v1:cross_network_automation.proto
@com_google_googleapis//google/cloud/networkconnectivity/v1:hub.proto
@com_google_googleapis//google/cloud/networkconnectivity/v1:policy_based_routing.proto
104 changes: 104 additions & 0 deletions google/cloud/networkconnectivity/v1/hub_client.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,110 @@ HubServiceClient::AcceptHubSpoke(
return connection_->AcceptHubSpoke(operation);
}

future<
StatusOr<google::cloud::networkconnectivity::v1::AcceptSpokeUpdateResponse>>
HubServiceClient::AcceptSpokeUpdate(std::string const& name,
std::string const& spoke_uri,
std::string const& spoke_etag,
Options opts) {
internal::OptionsSpan span(internal::MergeOptions(std::move(opts), options_));
google::cloud::networkconnectivity::v1::AcceptSpokeUpdateRequest request;
request.set_name(name);
request.set_spoke_uri(spoke_uri);
request.set_spoke_etag(spoke_etag);
return connection_->AcceptSpokeUpdate(request);
}

StatusOr<google::longrunning::Operation> HubServiceClient::AcceptSpokeUpdate(
NoAwaitTag, std::string const& name, std::string const& spoke_uri,
std::string const& spoke_etag, Options opts) {
internal::OptionsSpan span(internal::MergeOptions(std::move(opts), options_));
google::cloud::networkconnectivity::v1::AcceptSpokeUpdateRequest request;
request.set_name(name);
request.set_spoke_uri(spoke_uri);
request.set_spoke_etag(spoke_etag);
return connection_->AcceptSpokeUpdate(NoAwaitTag{}, request);
}

future<
StatusOr<google::cloud::networkconnectivity::v1::AcceptSpokeUpdateResponse>>
HubServiceClient::AcceptSpokeUpdate(
google::cloud::networkconnectivity::v1::AcceptSpokeUpdateRequest const&
request,
Options opts) {
internal::OptionsSpan span(internal::MergeOptions(std::move(opts), options_));
return connection_->AcceptSpokeUpdate(request);
}

StatusOr<google::longrunning::Operation> HubServiceClient::AcceptSpokeUpdate(
NoAwaitTag,
google::cloud::networkconnectivity::v1::AcceptSpokeUpdateRequest const&
request,
Options opts) {
internal::OptionsSpan span(internal::MergeOptions(std::move(opts), options_));
return connection_->AcceptSpokeUpdate(NoAwaitTag{}, request);
}

future<
StatusOr<google::cloud::networkconnectivity::v1::AcceptSpokeUpdateResponse>>
HubServiceClient::AcceptSpokeUpdate(
google::longrunning::Operation const& operation, Options opts) {
internal::OptionsSpan span(internal::MergeOptions(std::move(opts), options_));
return connection_->AcceptSpokeUpdate(operation);
}

future<
StatusOr<google::cloud::networkconnectivity::v1::RejectSpokeUpdateResponse>>
HubServiceClient::RejectSpokeUpdate(std::string const& name,
std::string const& spoke_uri,
std::string const& spoke_etag,
Options opts) {
internal::OptionsSpan span(internal::MergeOptions(std::move(opts), options_));
google::cloud::networkconnectivity::v1::RejectSpokeUpdateRequest request;
request.set_name(name);
request.set_spoke_uri(spoke_uri);
request.set_spoke_etag(spoke_etag);
return connection_->RejectSpokeUpdate(request);
}

StatusOr<google::longrunning::Operation> HubServiceClient::RejectSpokeUpdate(
NoAwaitTag, std::string const& name, std::string const& spoke_uri,
std::string const& spoke_etag, Options opts) {
internal::OptionsSpan span(internal::MergeOptions(std::move(opts), options_));
google::cloud::networkconnectivity::v1::RejectSpokeUpdateRequest request;
request.set_name(name);
request.set_spoke_uri(spoke_uri);
request.set_spoke_etag(spoke_etag);
return connection_->RejectSpokeUpdate(NoAwaitTag{}, request);
}

future<
StatusOr<google::cloud::networkconnectivity::v1::RejectSpokeUpdateResponse>>
HubServiceClient::RejectSpokeUpdate(
google::cloud::networkconnectivity::v1::RejectSpokeUpdateRequest const&
request,
Options opts) {
internal::OptionsSpan span(internal::MergeOptions(std::move(opts), options_));
return connection_->RejectSpokeUpdate(request);
}

StatusOr<google::longrunning::Operation> HubServiceClient::RejectSpokeUpdate(
NoAwaitTag,
google::cloud::networkconnectivity::v1::RejectSpokeUpdateRequest const&
request,
Options opts) {
internal::OptionsSpan span(internal::MergeOptions(std::move(opts), options_));
return connection_->RejectSpokeUpdate(NoAwaitTag{}, request);
}

future<
StatusOr<google::cloud::networkconnectivity::v1::RejectSpokeUpdateResponse>>
HubServiceClient::RejectSpokeUpdate(
google::longrunning::Operation const& operation, Options opts) {
internal::OptionsSpan span(internal::MergeOptions(std::move(opts), options_));
return connection_->RejectSpokeUpdate(operation);
}

future<StatusOr<google::cloud::networkconnectivity::v1::OperationMetadata>>
HubServiceClient::DeleteSpoke(std::string const& name, Options opts) {
internal::OptionsSpan span(internal::MergeOptions(std::move(opts), options_));
Expand Down
Loading
Loading