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.

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

chore: update googleapis SHA circa 2024-12-13 #14905

Merged
merged 4 commits into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@ python.toolchain(
bazel_dep(name = "googleapis", version = "0.0.0", repo_name = "com_google_googleapis")
archive_override(
module_name = "googleapis",
integrity = "sha256-B9C8wQIemnTrAU+vRg/93P816tjLJZjrNpLjmUT7qOg=",
integrity = "sha256-nqH6sI2rZfsPg8mmAw2vfv2eyiVJCWGyrnyqx2acWk4=",
patch_strip = 1,
patches = ["//bazel:googleapis.modules.patch"],
strip_prefix = "googleapis-d675ec222c431e3346ba8aaf0027392fe8b3d90c",
strip_prefix = "googleapis-f4eff5440fd07389f820d22d2a55690c6390dc6d",
urls = [
"https://github.com/googleapis/googleapis/archive/d675ec222c431e3346ba8aaf0027392fe8b3d90c.tar.gz",
"https://github.com/googleapis/googleapis/archive/f4eff5440fd07389f820d22d2a55690c6390dc6d.tar.gz",
],
)

Expand Down
6 changes: 3 additions & 3 deletions bazel/workspace0.bzl
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/d675ec222c431e3346ba8aaf0027392fe8b3d90c.tar.gz",
"https://github.com/googleapis/googleapis/archive/f4eff5440fd07389f820d22d2a55690c6390dc6d.tar.gz",
],
sha256 = "07d0bcc1021e9a74eb014faf460ffddcff35ead8cb2598eb3692e39944fba8e8",
strip_prefix = "googleapis-d675ec222c431e3346ba8aaf0027392fe8b3d90c",
sha256 = "9ea1fab08dab65fb0f83c9a6030daf7efd9eca25490961b2ae7caac7669c5a4e",
strip_prefix = "googleapis-f4eff5440fd07389f820d22d2a55690c6390dc6d",
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
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
"d675ec222c431e3346ba8aaf0027392fe8b3d90c")
"f4eff5440fd07389f820d22d2a55690c6390dc6d")
set(_GOOGLE_CLOUD_CPP_GOOGLEAPIS_SHA256
"07d0bcc1021e9a74eb014faf460ffddcff35ead8cb2598eb3692e39944fba8e8")
"9ea1fab08dab65fb0f83c9a6030daf7efd9eca25490961b2ae7caac7669c5a4e")

set(DOXYGEN_ALIASES
"googleapis_link{2}=\"[\\1](https://github.com/googleapis/googleapis/blob/${_GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA}/\\2)\""
Expand Down
2 changes: 2 additions & 0 deletions external/googleapis/protodeps/monitoring.deps
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@com_google_googleapis//google/api:client_proto
@com_google_googleapis//google/api:distribution_proto
@com_google_googleapis//google/api:field_behavior_proto
@com_google_googleapis//google/api:field_info_proto
@com_google_googleapis//google/api:http_proto
@com_google_googleapis//google/api:label_proto
@com_google_googleapis//google/api:launch_stage_proto
Expand All @@ -12,3 +13,4 @@
@com_google_googleapis//google/rpc:status_proto
@com_google_googleapis//google/type:calendar_period_proto
@com_google_googleapis//google/type:interval_proto
@com_google_googleapis//google/type:timeofday_proto
1 change: 1 addition & 0 deletions external/googleapis/protodeps/networkconnectivity.deps
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@com_google_googleapis//google/api:annotations_proto
@com_google_googleapis//google/api:client_proto
@com_google_googleapis//google/api:field_behavior_proto
@com_google_googleapis//google/api:field_info_proto
@com_google_googleapis//google/api:http_proto
@com_google_googleapis//google/api:launch_stage_proto
@com_google_googleapis//google/api:resource_proto
Expand Down
7 changes: 5 additions & 2 deletions external/googleapis/renovate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ if [[ -z "$COMMIT_DATE" ]]; then
COMMIT_DATE=$(date +%Y-%m-%d)
fi

COMMIT=f4eff5440fd07389f820d22d2a55690c6390dc6d
COMMIT_DATE="2024-12-13"

Comment on lines +39 to +41
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what happened here?

DOWNLOAD="$(mktemp)"
curl -fsSL "https://github.com/${REPO}/archive/${COMMIT}.tar.gz" -o "${DOWNLOAD}"
gsutil -q cp "${DOWNLOAD}" "gs://cloud-cpp-community-archive/com_google_googleapis/${COMMIT}.tar.gz"
Expand All @@ -51,8 +54,8 @@ until grep -q "/googleapis/archive/${REV_COMMIT}\.tar" bazel/workspace0.bzl; do
done
rm -f "${DOWNLOAD}"

banner "Updating Cache for Bazel"
bazel/deps-cache.py -p
#banner "Updating Cache for Bazel"
#bazel/deps-cache.py -p

banner "Updating Bazel/CMake dependencies"
sed -i -f - bazel/workspace0.bzl <<EOT
Expand Down
8 changes: 4 additions & 4 deletions google/cloud/automl/v1/auto_ml_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ class AutoMlClient {
/// [`StatusOr`]: @ref google::cloud::StatusOr
/// [`Status`]: @ref google::cloud::Status
/// [google.cloud.automl.v1.ImportDataRequest]: @googleapis_reference_link{google/cloud/automl/v1/service.proto#L379}
/// [google.cloud.automl.v1.InputConfig.params]: @googleapis_reference_link{google/cloud/automl/v1/io.proto#L660}
/// [google.cloud.automl.v1.InputConfig.params]: @googleapis_reference_link{google/cloud/automl/v1/io.proto#L655}
/// [google.cloud.automl.v1.OperationMetadata]: @googleapis_reference_link{google/cloud/automl/v1/operations.proto#L31}
/// [google.longrunning.Operation.response]: @googleapis_reference_link{google/longrunning/operations.proto#L154}
///
Expand Down Expand Up @@ -628,7 +628,7 @@ class AutoMlClient {
/// [`StatusOr`]: @ref google::cloud::StatusOr
/// [`Status`]: @ref google::cloud::Status
/// [google.cloud.automl.v1.ImportDataRequest]: @googleapis_reference_link{google/cloud/automl/v1/service.proto#L379}
/// [google.cloud.automl.v1.InputConfig.params]: @googleapis_reference_link{google/cloud/automl/v1/io.proto#L660}
/// [google.cloud.automl.v1.InputConfig.params]: @googleapis_reference_link{google/cloud/automl/v1/io.proto#L655}
/// [google.cloud.automl.v1.OperationMetadata]: @googleapis_reference_link{google/cloud/automl/v1/operations.proto#L31}
/// [google.longrunning.Operation.response]: @googleapis_reference_link{google/longrunning/operations.proto#L154}
///
Expand Down Expand Up @@ -1570,7 +1570,7 @@ class AutoMlClient {
/// [`StatusOr`]: @ref google::cloud::StatusOr
/// [`Status`]: @ref google::cloud::Status
/// [google.cloud.automl.v1.ExportModelRequest]: @googleapis_reference_link{google/cloud/automl/v1/service.proto#L539}
/// [google.cloud.automl.v1.ModelExportOutputConfig]: @googleapis_reference_link{google/cloud/automl/v1/io.proto#L1256}
/// [google.cloud.automl.v1.ModelExportOutputConfig]: @googleapis_reference_link{google/cloud/automl/v1/io.proto#L1243}
/// [google.cloud.automl.v1.OperationMetadata]: @googleapis_reference_link{google/cloud/automl/v1/operations.proto#L31}
/// [google.longrunning.Operation.response]: @googleapis_reference_link{google/longrunning/operations.proto#L154}
///
Expand Down Expand Up @@ -1633,7 +1633,7 @@ class AutoMlClient {
/// [`StatusOr`]: @ref google::cloud::StatusOr
/// [`Status`]: @ref google::cloud::Status
/// [google.cloud.automl.v1.ExportModelRequest]: @googleapis_reference_link{google/cloud/automl/v1/service.proto#L539}
/// [google.cloud.automl.v1.ModelExportOutputConfig]: @googleapis_reference_link{google/cloud/automl/v1/io.proto#L1256}
/// [google.cloud.automl.v1.ModelExportOutputConfig]: @googleapis_reference_link{google/cloud/automl/v1/io.proto#L1243}
/// [google.cloud.automl.v1.OperationMetadata]: @googleapis_reference_link{google/cloud/automl/v1/operations.proto#L31}
/// [google.longrunning.Operation.response]: @googleapis_reference_link{google/longrunning/operations.proto#L154}
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,16 @@ ReservationServiceAuth::UpdateReservation(
return child_->UpdateReservation(context, options, request);
}

StatusOr<google::cloud::bigquery::reservation::v1::Reservation>
ReservationServiceAuth::FailoverReservation(
grpc::ClientContext& context, Options const& options,
google::cloud::bigquery::reservation::v1::FailoverReservationRequest const&
request) {
auto status = auth_->ConfigureContext(context);
if (!status.ok()) return status;
return child_->FailoverReservation(context, options, request);
}

StatusOr<google::cloud::bigquery::reservation::v1::CapacityCommitment>
ReservationServiceAuth::CreateCapacityCommitment(
grpc::ClientContext& context, Options const& options,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ class ReservationServiceAuth : public ReservationServiceStub {
google::cloud::bigquery::reservation::v1::UpdateReservationRequest const&
request) override;

StatusOr<google::cloud::bigquery::reservation::v1::Reservation>
FailoverReservation(grpc::ClientContext& context, Options const& options,
google::cloud::bigquery::reservation::v1::
FailoverReservationRequest const& request) override;

StatusOr<google::cloud::bigquery::reservation::v1::CapacityCommitment>
CreateCapacityCommitment(
grpc::ClientContext& context, Options const& options,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,22 @@ ReservationServiceConnectionImpl::UpdateReservation(
*current, request, __func__);
}

StatusOr<google::cloud::bigquery::reservation::v1::Reservation>
ReservationServiceConnectionImpl::FailoverReservation(
google::cloud::bigquery::reservation::v1::FailoverReservationRequest const&
request) {
auto current = google::cloud::internal::SaveCurrentOptions();
return google::cloud::internal::RetryLoop(
retry_policy(*current), backoff_policy(*current),
idempotency_policy(*current)->FailoverReservation(request),
[this](grpc::ClientContext& context, Options const& options,
google::cloud::bigquery::reservation::v1::
FailoverReservationRequest const& request) {
return stub_->FailoverReservation(context, options, request);
},
*current, request, __func__);
}

StatusOr<google::cloud::bigquery::reservation::v1::CapacityCommitment>
ReservationServiceConnectionImpl::CreateCapacityCommitment(
google::cloud::bigquery::reservation::v1::
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ class ReservationServiceConnectionImpl
google::cloud::bigquery::reservation::v1::UpdateReservationRequest const&
request) override;

StatusOr<google::cloud::bigquery::reservation::v1::Reservation>
FailoverReservation(google::cloud::bigquery::reservation::v1::
FailoverReservationRequest const& request) override;

StatusOr<google::cloud::bigquery::reservation::v1::CapacityCommitment>
CreateCapacityCommitment(
google::cloud::bigquery::reservation::v1::
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,20 @@ ReservationServiceLogging::UpdateReservation(
context, options, request, __func__, tracing_options_);
}

StatusOr<google::cloud::bigquery::reservation::v1::Reservation>
ReservationServiceLogging::FailoverReservation(
grpc::ClientContext& context, Options const& options,
google::cloud::bigquery::reservation::v1::FailoverReservationRequest const&
request) {
return google::cloud::internal::LogWrapper(
[this](grpc::ClientContext& context, Options const& options,
google::cloud::bigquery::reservation::v1::
FailoverReservationRequest const& request) {
return child_->FailoverReservation(context, options, request);
},
context, options, request, __func__, tracing_options_);
}

StatusOr<google::cloud::bigquery::reservation::v1::CapacityCommitment>
ReservationServiceLogging::CreateCapacityCommitment(
grpc::ClientContext& context, Options const& options,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ class ReservationServiceLogging : public ReservationServiceStub {
google::cloud::bigquery::reservation::v1::UpdateReservationRequest const&
request) override;

StatusOr<google::cloud::bigquery::reservation::v1::Reservation>
FailoverReservation(grpc::ClientContext& context, Options const& options,
google::cloud::bigquery::reservation::v1::
FailoverReservationRequest const& request) override;

StatusOr<google::cloud::bigquery::reservation::v1::CapacityCommitment>
CreateCapacityCommitment(
grpc::ClientContext& context, Options const& options,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,16 @@ ReservationServiceMetadata::UpdateReservation(
return child_->UpdateReservation(context, options, request);
}

StatusOr<google::cloud::bigquery::reservation::v1::Reservation>
ReservationServiceMetadata::FailoverReservation(
grpc::ClientContext& context, Options const& options,
google::cloud::bigquery::reservation::v1::FailoverReservationRequest const&
request) {
SetMetadata(context, options,
absl::StrCat("name=", internal::UrlEncode(request.name())));
return child_->FailoverReservation(context, options, request);
}

StatusOr<google::cloud::bigquery::reservation::v1::CapacityCommitment>
ReservationServiceMetadata::CreateCapacityCommitment(
grpc::ClientContext& context, Options const& options,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ class ReservationServiceMetadata : public ReservationServiceStub {
google::cloud::bigquery::reservation::v1::UpdateReservationRequest const&
request) override;

StatusOr<google::cloud::bigquery::reservation::v1::Reservation>
FailoverReservation(grpc::ClientContext& context, Options const& options,
google::cloud::bigquery::reservation::v1::
FailoverReservationRequest const& request) override;

StatusOr<google::cloud::bigquery::reservation::v1::CapacityCommitment>
CreateCapacityCommitment(
grpc::ClientContext& context, Options const& options,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,19 @@ DefaultReservationServiceStub::UpdateReservation(
return response;
}

StatusOr<google::cloud::bigquery::reservation::v1::Reservation>
DefaultReservationServiceStub::FailoverReservation(
grpc::ClientContext& context, Options const&,
google::cloud::bigquery::reservation::v1::FailoverReservationRequest const&
request) {
google::cloud::bigquery::reservation::v1::Reservation response;
auto status = grpc_stub_->FailoverReservation(&context, request, &response);
if (!status.ok()) {
return google::cloud::MakeStatusFromRpcError(status);
}
return response;
}

StatusOr<google::cloud::bigquery::reservation::v1::CapacityCommitment>
DefaultReservationServiceStub::CreateCapacityCommitment(
grpc::ClientContext& context, Options const&,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@ class ReservationServiceStub {
google::cloud::bigquery::reservation::v1::UpdateReservationRequest const&
request) = 0;

virtual StatusOr<google::cloud::bigquery::reservation::v1::Reservation>
FailoverReservation(grpc::ClientContext& context, Options const& options,
google::cloud::bigquery::reservation::v1::
FailoverReservationRequest const& request) = 0;

virtual StatusOr<google::cloud::bigquery::reservation::v1::CapacityCommitment>
CreateCapacityCommitment(
grpc::ClientContext& context, Options const& options,
Expand Down Expand Up @@ -199,6 +204,11 @@ class DefaultReservationServiceStub : public ReservationServiceStub {
google::cloud::bigquery::reservation::v1::UpdateReservationRequest const&
request) override;

StatusOr<google::cloud::bigquery::reservation::v1::Reservation>
FailoverReservation(grpc::ClientContext& context, Options const& options,
google::cloud::bigquery::reservation::v1::
FailoverReservationRequest const& request) override;

StatusOr<google::cloud::bigquery::reservation::v1::CapacityCommitment>
CreateCapacityCommitment(
grpc::ClientContext& context, Options const& options,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,17 @@ ReservationServiceTracingConnection::UpdateReservation(
return internal::EndSpan(*span, child_->UpdateReservation(request));
}

StatusOr<google::cloud::bigquery::reservation::v1::Reservation>
ReservationServiceTracingConnection::FailoverReservation(
google::cloud::bigquery::reservation::v1::FailoverReservationRequest const&
request) {
auto span = internal::MakeSpan(
"bigquery_reservation_v1::ReservationServiceConnection::"
"FailoverReservation");
auto scope = opentelemetry::trace::Scope(span);
return internal::EndSpan(*span, child_->FailoverReservation(request));
}

StatusOr<google::cloud::bigquery::reservation::v1::CapacityCommitment>
ReservationServiceTracingConnection::CreateCapacityCommitment(
google::cloud::bigquery::reservation::v1::
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ class ReservationServiceTracingConnection
google::cloud::bigquery::reservation::v1::UpdateReservationRequest const&
request) override;

StatusOr<google::cloud::bigquery::reservation::v1::Reservation>
FailoverReservation(google::cloud::bigquery::reservation::v1::
FailoverReservationRequest const& request) override;

StatusOr<google::cloud::bigquery::reservation::v1::CapacityCommitment>
CreateCapacityCommitment(
google::cloud::bigquery::reservation::v1::
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,20 @@ ReservationServiceTracingStub::UpdateReservation(
context, *span, child_->UpdateReservation(context, options, request));
}

StatusOr<google::cloud::bigquery::reservation::v1::Reservation>
ReservationServiceTracingStub::FailoverReservation(
grpc::ClientContext& context, Options const& options,
google::cloud::bigquery::reservation::v1::FailoverReservationRequest const&
request) {
auto span = internal::MakeSpanGrpc(
"google.cloud.bigquery.reservation.v1.ReservationService",
"FailoverReservation");
auto scope = opentelemetry::trace::Scope(span);
internal::InjectTraceContext(context, *propagator_);
return internal::EndSpan(
context, *span, child_->FailoverReservation(context, options, request));
}

StatusOr<google::cloud::bigquery::reservation::v1::CapacityCommitment>
ReservationServiceTracingStub::CreateCapacityCommitment(
grpc::ClientContext& context, Options const& options,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ class ReservationServiceTracingStub : public ReservationServiceStub {
google::cloud::bigquery::reservation::v1::UpdateReservationRequest const&
request) override;

StatusOr<google::cloud::bigquery::reservation::v1::Reservation>
FailoverReservation(grpc::ClientContext& context, Options const& options,
google::cloud::bigquery::reservation::v1::
FailoverReservationRequest const& request) override;

StatusOr<google::cloud::bigquery::reservation::v1::CapacityCommitment>
CreateCapacityCommitment(
grpc::ClientContext& context, Options const& options,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@ class MockReservationServiceConnection
request),
(override));

MOCK_METHOD(StatusOr<google::cloud::bigquery::reservation::v1::Reservation>,
FailoverReservation,
(google::cloud::bigquery::reservation::v1::
FailoverReservationRequest const& request),
(override));

MOCK_METHOD(
StatusOr<google::cloud::bigquery::reservation::v1::CapacityCommitment>,
CreateCapacityCommitment,
Expand Down
9 changes: 9 additions & 0 deletions google/cloud/bigquery/reservation/v1/reservation_client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,15 @@ ReservationServiceClient::UpdateReservation(
return connection_->UpdateReservation(request);
}

StatusOr<google::cloud::bigquery::reservation::v1::Reservation>
ReservationServiceClient::FailoverReservation(
google::cloud::bigquery::reservation::v1::FailoverReservationRequest const&
request,
Options opts) {
internal::OptionsSpan span(internal::MergeOptions(std::move(opts), options_));
return connection_->FailoverReservation(request);
}

StatusOr<google::cloud::bigquery::reservation::v1::CapacityCommitment>
ReservationServiceClient::CreateCapacityCommitment(
std::string const& parent,
Expand Down
Loading
Loading