Skip to content
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
2 changes: 1 addition & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ python.toolchain(
)

bazel_dep(name = "grpc", version = "1.76.0.bcr.1")
bazel_dep(name = "googleapis", version = "0.0.0-20260130-c0fcb356")
bazel_dep(name = "googleapis", version = "0.0.0-20260223-edfe7983")
bazel_dep(name = "googleapis-cc", version = "1.0.0")
bazel_dep(name = "googleapis-grpc-cc", version = "1.0.0")
6 changes: 3 additions & 3 deletions bazel/workspace0.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,10 @@ def gl_cpp_workspace0(name = None):
http_archive,
name = "googleapis",
urls = [
"https://github.com/googleapis/googleapis/archive/c0fcb35628690e9eb15dcefae41c651c67cd050b.tar.gz",
"https://github.com/googleapis/googleapis/archive/edfe7983b9d99d6244b4d7636d25fa6e752a2041.tar.gz",
],
sha256 = "68c82109667c892b6595385b2ad77c1342752f998664eb6d055509ecaddc3150",
strip_prefix = "googleapis-c0fcb35628690e9eb15dcefae41c651c67cd050b",
sha256 = "daf93e1331c16fab7606828bcdc92aa72160718de0819eb628fae9922ccaadfc",
strip_prefix = "googleapis-edfe7983b9d99d6244b4d7636d25fa6e752a2041",
build_file = Label("//bazel:googleapis.BUILD"),
# Scaffolding for patching googleapis after download. For example:
patches = [
Expand Down
1 change: 1 addition & 0 deletions ci/cloudbuild/builds/cmake-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ expected_dirs+=(
./include/google/cloud/gkebackup/logging/v1
./include/google/cloud/gkehub/v1/configmanagement
./include/google/cloud/gkehub/v1/multiclusteringress
./include/google/cloud/gkehub/v1/rbacrolebindingactuation
./include/google/cloud/internal
./include/google/cloud/internal/win32
./include/google/cloud/location
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
"c0fcb35628690e9eb15dcefae41c651c67cd050b")
"edfe7983b9d99d6244b4d7636d25fa6e752a2041")
set(_GOOGLE_CLOUD_CPP_GOOGLEAPIS_SHA256
"68c82109667c892b6595385b2ad77c1342752f998664eb6d055509ecaddc3150")
"daf93e1331c16fab7606828bcdc92aa72160718de0819eb628fae9922ccaadfc")

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/gkehub.deps
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@googleapis//google/api:annotations_proto
@googleapis//google/api:client_proto
@googleapis//google/api:field_behavior_proto
@googleapis//google/api:field_info_proto
@googleapis//google/api:http_proto
@googleapis//google/api:launch_stage_proto
@googleapis//google/api:resource_proto
Expand Down
2 changes: 2 additions & 0 deletions external/googleapis/protolists/gkehub.list
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
@googleapis//google/cloud/gkehub/v1/configmanagement:configmanagement.proto
@googleapis//google/cloud/gkehub/v1/multiclusteringress:multiclusteringress.proto
@googleapis//google/cloud/gkehub/v1/rbacrolebindingactuation:rbacrolebindingactuation.proto
@googleapis//google/cloud/gkehub/v1:feature.proto
@googleapis//google/cloud/gkehub/v1:fleet.proto
@googleapis//google/cloud/gkehub/v1:membership.proto
@googleapis//google/cloud/gkehub/v1:service.proto
9 changes: 9 additions & 0 deletions generator/internal/descriptor_utils.cc
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,11 @@ ParameterCommentSubstitution substitutions[] = {
{"`projects/<ProjectID>/locations/<LocationID>/agents/<AgentID>.",
"`projects/<ProjectID>/locations/<LocationID>/agents/<AgentID>`."},

// From google/cloud/gkehub/v1/service.proto
{R"""(Given 'updated'
prefix to follow go/proto-best-practices-checkers#keyword_conflict)""",
R"""()"""},

// Some comments include multiple newlines in a row. We need to preserve
// these because they are paragraph separators. When used in `@param`
// commands we need to represent them as `@n` or they do would terminate the
Expand Down Expand Up @@ -342,6 +347,10 @@ std::string FormattedCommentsForParameter(
google::protobuf::SourceLocation loc;
parameter_descriptor->GetSourceLocation(&loc);
auto comment = EscapePrinterDelimiter(ChompByValue(loc.leading_comments));
if (absl::StrContains(comment,
"go/proto-best-practices-checkers#keyword_conflict")) {
std::cout << __func__ << comment << "\n";
}
Comment on lines +350 to +353
Copy link
Contributor

Choose a reason for hiding this comment

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

That looks like debugging that should not have been merged.

Copy link
Member Author

Choose a reason for hiding this comment

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

Created #15992 to remove this. Good catch!

// This is an arbitrary threshold. The intent is to simplify the generator
// code for corner cases. In the few cases where the documentation of a field
// is extremely detailed it manages to confuse Doxygen. We could try to
Expand Down
92 changes: 44 additions & 48 deletions google/cloud/aiplatform/v1/dataset_client.h

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions google/cloud/aiplatform/v1/job_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -2133,7 +2133,7 @@ class JobServiceClient {
/// [`future`]: @ref google::cloud::future
/// [`StatusOr`]: @ref google::cloud::StatusOr
/// [`Status`]: @ref google::cloud::Status
/// [google.cloud.aiplatform.v1.BatchPredictionJob.state]: @googleapis_reference_link{google/cloud/aiplatform/v1/batch_prediction_job.proto#L394}
/// [google.cloud.aiplatform.v1.BatchPredictionJob.state]: @googleapis_reference_link{google/cloud/aiplatform/v1/batch_prediction_job.proto#L413}
/// [google.cloud.aiplatform.v1.CancelBatchPredictionJobRequest]: @googleapis_reference_link{google/cloud/aiplatform/v1/job_service.proto#L1116}
/// [google.cloud.aiplatform.v1.JobService.GetBatchPredictionJob]: @googleapis_reference_link{google/cloud/aiplatform/v1/job_service.proto#L311}
///
Expand Down Expand Up @@ -2172,7 +2172,7 @@ class JobServiceClient {
/// [`future`]: @ref google::cloud::future
/// [`StatusOr`]: @ref google::cloud::StatusOr
/// [`Status`]: @ref google::cloud::Status
/// [google.cloud.aiplatform.v1.BatchPredictionJob.state]: @googleapis_reference_link{google/cloud/aiplatform/v1/batch_prediction_job.proto#L394}
/// [google.cloud.aiplatform.v1.BatchPredictionJob.state]: @googleapis_reference_link{google/cloud/aiplatform/v1/batch_prediction_job.proto#L413}
/// [google.cloud.aiplatform.v1.CancelBatchPredictionJobRequest]: @googleapis_reference_link{google/cloud/aiplatform/v1/job_service.proto#L1116}
/// [google.cloud.aiplatform.v1.JobService.GetBatchPredictionJob]: @googleapis_reference_link{google/cloud/aiplatform/v1/job_service.proto#L311}
///
Expand Down
8 changes: 4 additions & 4 deletions google/cloud/aiplatform/v1/prediction_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -802,8 +802,8 @@ class PredictionServiceClient {
/// [`future`]: @ref google::cloud::future
/// [`StatusOr`]: @ref google::cloud::StatusOr
/// [`Status`]: @ref google::cloud::Status
/// [google.cloud.aiplatform.v1.EmbedContentRequest]: @googleapis_reference_link{google/cloud/aiplatform/v1/prediction_service.proto#L866}
/// [google.cloud.aiplatform.v1.EmbedContentResponse]: @googleapis_reference_link{google/cloud/aiplatform/v1/prediction_service.proto#L926}
/// [google.cloud.aiplatform.v1.EmbedContentRequest]: @googleapis_reference_link{google/cloud/aiplatform/v1/prediction_service.proto#L894}
/// [google.cloud.aiplatform.v1.EmbedContentResponse]: @googleapis_reference_link{google/cloud/aiplatform/v1/prediction_service.proto#L954}
///
// clang-format on
StatusOr<google::cloud::aiplatform::v1::EmbedContentResponse> EmbedContent(
Expand Down Expand Up @@ -833,8 +833,8 @@ class PredictionServiceClient {
/// [`future`]: @ref google::cloud::future
/// [`StatusOr`]: @ref google::cloud::StatusOr
/// [`Status`]: @ref google::cloud::Status
/// [google.cloud.aiplatform.v1.EmbedContentRequest]: @googleapis_reference_link{google/cloud/aiplatform/v1/prediction_service.proto#L866}
/// [google.cloud.aiplatform.v1.EmbedContentResponse]: @googleapis_reference_link{google/cloud/aiplatform/v1/prediction_service.proto#L926}
/// [google.cloud.aiplatform.v1.EmbedContentRequest]: @googleapis_reference_link{google/cloud/aiplatform/v1/prediction_service.proto#L894}
/// [google.cloud.aiplatform.v1.EmbedContentResponse]: @googleapis_reference_link{google/cloud/aiplatform/v1/prediction_service.proto#L954}
///
// clang-format on
StatusOr<google::cloud::aiplatform::v1::EmbedContentResponse> EmbedContent(
Expand Down
6 changes: 3 additions & 3 deletions google/cloud/aiplatform/v1/schedule_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ class ScheduleServiceClient {
/// [`StatusOr`]: @ref google::cloud::StatusOr
/// [`Status`]: @ref google::cloud::Status
/// [google.cloud.aiplatform.v1.ResumeScheduleRequest]: @googleapis_reference_link{google/cloud/aiplatform/v1/schedule_service.proto#L277}
/// [google.cloud.aiplatform.v1.Schedule.catch_up]: @googleapis_reference_link{google/cloud/aiplatform/v1/schedule.proto#L170}
/// [google.cloud.aiplatform.v1.Schedule.catch_up]: @googleapis_reference_link{google/cloud/aiplatform/v1/schedule.proto#L178}
/// [google.cloud.aiplatform.v1.Schedule.state]: @googleapis_reference_link{google/cloud/aiplatform/v1/schedule.proto#L131}
///
// clang-format on
Expand Down Expand Up @@ -522,7 +522,7 @@ class ScheduleServiceClient {
/// [`StatusOr`]: @ref google::cloud::StatusOr
/// [`Status`]: @ref google::cloud::Status
/// [google.cloud.aiplatform.v1.ResumeScheduleRequest]: @googleapis_reference_link{google/cloud/aiplatform/v1/schedule_service.proto#L277}
/// [google.cloud.aiplatform.v1.Schedule.catch_up]: @googleapis_reference_link{google/cloud/aiplatform/v1/schedule.proto#L170}
/// [google.cloud.aiplatform.v1.Schedule.catch_up]: @googleapis_reference_link{google/cloud/aiplatform/v1/schedule.proto#L178}
/// [google.cloud.aiplatform.v1.Schedule.state]: @googleapis_reference_link{google/cloud/aiplatform/v1/schedule.proto#L131}
///
// clang-format on
Expand Down Expand Up @@ -559,7 +559,7 @@ class ScheduleServiceClient {
/// [`StatusOr`]: @ref google::cloud::StatusOr
/// [`Status`]: @ref google::cloud::Status
/// [google.cloud.aiplatform.v1.ResumeScheduleRequest]: @googleapis_reference_link{google/cloud/aiplatform/v1/schedule_service.proto#L277}
/// [google.cloud.aiplatform.v1.Schedule.catch_up]: @googleapis_reference_link{google/cloud/aiplatform/v1/schedule.proto#L170}
/// [google.cloud.aiplatform.v1.Schedule.catch_up]: @googleapis_reference_link{google/cloud/aiplatform/v1/schedule.proto#L178}
/// [google.cloud.aiplatform.v1.Schedule.state]: @googleapis_reference_link{google/cloud/aiplatform/v1/schedule.proto#L131}
///
// clang-format on
Expand Down
28 changes: 14 additions & 14 deletions google/cloud/artifactregistry/v1/artifact_registry_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -1936,8 +1936,8 @@ class ArtifactRegistryClient {
/// [`future`]: @ref google::cloud::future
/// [`StatusOr`]: @ref google::cloud::StatusOr
/// [`Status`]: @ref google::cloud::Status
/// [google.devtools.artifactregistry.v1.File]: @googleapis_reference_link{google/devtools/artifactregistry/v1/file.proto#L54}
/// [google.devtools.artifactregistry.v1.ListFilesRequest]: @googleapis_reference_link{google/devtools/artifactregistry/v1/file.proto#L92}
/// [google.devtools.artifactregistry.v1.File]: @googleapis_reference_link{google/devtools/artifactregistry/v1/file.proto#L57}
/// [google.devtools.artifactregistry.v1.ListFilesRequest]: @googleapis_reference_link{google/devtools/artifactregistry/v1/file.proto#L95}
///
// clang-format on
StreamRange<google::devtools::artifactregistry::v1::File> ListFiles(
Expand Down Expand Up @@ -1975,8 +1975,8 @@ class ArtifactRegistryClient {
/// [`future`]: @ref google::cloud::future
/// [`StatusOr`]: @ref google::cloud::StatusOr
/// [`Status`]: @ref google::cloud::Status
/// [google.devtools.artifactregistry.v1.File]: @googleapis_reference_link{google/devtools/artifactregistry/v1/file.proto#L54}
/// [google.devtools.artifactregistry.v1.ListFilesRequest]: @googleapis_reference_link{google/devtools/artifactregistry/v1/file.proto#L92}
/// [google.devtools.artifactregistry.v1.File]: @googleapis_reference_link{google/devtools/artifactregistry/v1/file.proto#L57}
/// [google.devtools.artifactregistry.v1.ListFilesRequest]: @googleapis_reference_link{google/devtools/artifactregistry/v1/file.proto#L95}
///
// clang-format on
StreamRange<google::devtools::artifactregistry::v1::File> ListFiles(
Expand All @@ -2001,8 +2001,8 @@ class ArtifactRegistryClient {
/// [`future`]: @ref google::cloud::future
/// [`StatusOr`]: @ref google::cloud::StatusOr
/// [`Status`]: @ref google::cloud::Status
/// [google.devtools.artifactregistry.v1.File]: @googleapis_reference_link{google/devtools/artifactregistry/v1/file.proto#L54}
/// [google.devtools.artifactregistry.v1.GetFileRequest]: @googleapis_reference_link{google/devtools/artifactregistry/v1/file.proto#L175}
/// [google.devtools.artifactregistry.v1.File]: @googleapis_reference_link{google/devtools/artifactregistry/v1/file.proto#L57}
/// [google.devtools.artifactregistry.v1.GetFileRequest]: @googleapis_reference_link{google/devtools/artifactregistry/v1/file.proto#L178}
///
// clang-format on
StatusOr<google::devtools::artifactregistry::v1::File> GetFile(
Expand Down Expand Up @@ -2031,8 +2031,8 @@ class ArtifactRegistryClient {
/// [`future`]: @ref google::cloud::future
/// [`StatusOr`]: @ref google::cloud::StatusOr
/// [`Status`]: @ref google::cloud::Status
/// [google.devtools.artifactregistry.v1.File]: @googleapis_reference_link{google/devtools/artifactregistry/v1/file.proto#L54}
/// [google.devtools.artifactregistry.v1.GetFileRequest]: @googleapis_reference_link{google/devtools/artifactregistry/v1/file.proto#L175}
/// [google.devtools.artifactregistry.v1.File]: @googleapis_reference_link{google/devtools/artifactregistry/v1/file.proto#L57}
/// [google.devtools.artifactregistry.v1.GetFileRequest]: @googleapis_reference_link{google/devtools/artifactregistry/v1/file.proto#L178}
///
// clang-format on
StatusOr<google::devtools::artifactregistry::v1::File> GetFile(
Expand Down Expand Up @@ -2066,7 +2066,7 @@ class ArtifactRegistryClient {
/// [`future`]: @ref google::cloud::future
/// [`StatusOr`]: @ref google::cloud::StatusOr
/// [`Status`]: @ref google::cloud::Status
/// [google.devtools.artifactregistry.v1.DeleteFileRequest]: @googleapis_reference_link{google/devtools/artifactregistry/v1/file.proto#L186}
/// [google.devtools.artifactregistry.v1.DeleteFileRequest]: @googleapis_reference_link{google/devtools/artifactregistry/v1/file.proto#L189}
/// [google.devtools.artifactregistry.v1.OperationMetadata]: @googleapis_reference_link{google/devtools/artifactregistry/v1/service.proto#L561}
///
// clang-format on
Expand Down Expand Up @@ -2120,7 +2120,7 @@ class ArtifactRegistryClient {
/// [`future`]: @ref google::cloud::future
/// [`StatusOr`]: @ref google::cloud::StatusOr
/// [`Status`]: @ref google::cloud::Status
/// [google.devtools.artifactregistry.v1.DeleteFileRequest]: @googleapis_reference_link{google/devtools/artifactregistry/v1/file.proto#L186}
/// [google.devtools.artifactregistry.v1.DeleteFileRequest]: @googleapis_reference_link{google/devtools/artifactregistry/v1/file.proto#L189}
/// [google.devtools.artifactregistry.v1.OperationMetadata]: @googleapis_reference_link{google/devtools/artifactregistry/v1/service.proto#L561}
///
// clang-format on
Expand Down Expand Up @@ -2179,8 +2179,8 @@ class ArtifactRegistryClient {
/// [`future`]: @ref google::cloud::future
/// [`StatusOr`]: @ref google::cloud::StatusOr
/// [`Status`]: @ref google::cloud::Status
/// [google.devtools.artifactregistry.v1.File]: @googleapis_reference_link{google/devtools/artifactregistry/v1/file.proto#L54}
/// [google.devtools.artifactregistry.v1.UpdateFileRequest]: @googleapis_reference_link{google/devtools/artifactregistry/v1/file.proto#L197}
/// [google.devtools.artifactregistry.v1.File]: @googleapis_reference_link{google/devtools/artifactregistry/v1/file.proto#L57}
/// [google.devtools.artifactregistry.v1.UpdateFileRequest]: @googleapis_reference_link{google/devtools/artifactregistry/v1/file.proto#L200}
///
// clang-format on
StatusOr<google::devtools::artifactregistry::v1::File> UpdateFile(
Expand Down Expand Up @@ -2210,8 +2210,8 @@ class ArtifactRegistryClient {
/// [`future`]: @ref google::cloud::future
/// [`StatusOr`]: @ref google::cloud::StatusOr
/// [`Status`]: @ref google::cloud::Status
/// [google.devtools.artifactregistry.v1.File]: @googleapis_reference_link{google/devtools/artifactregistry/v1/file.proto#L54}
/// [google.devtools.artifactregistry.v1.UpdateFileRequest]: @googleapis_reference_link{google/devtools/artifactregistry/v1/file.proto#L197}
/// [google.devtools.artifactregistry.v1.File]: @googleapis_reference_link{google/devtools/artifactregistry/v1/file.proto#L57}
/// [google.devtools.artifactregistry.v1.UpdateFileRequest]: @googleapis_reference_link{google/devtools/artifactregistry/v1/file.proto#L200}
///
// clang-format on
StatusOr<google::devtools::artifactregistry::v1::File> UpdateFile(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ class ConfidentialComputingClient {
/// [`StatusOr`]: @ref google::cloud::StatusOr
/// [`Status`]: @ref google::cloud::Status
/// [google.cloud.confidentialcomputing.v1.VerifyAttestationRequest]: @googleapis_reference_link{google/cloud/confidentialcomputing/v1/service.proto#L183}
/// [google.cloud.confidentialcomputing.v1.VerifyAttestationResponse]: @googleapis_reference_link{google/cloud/confidentialcomputing/v1/service.proto#L263}
/// [google.cloud.confidentialcomputing.v1.VerifyAttestationResponse]: @googleapis_reference_link{google/cloud/confidentialcomputing/v1/service.proto#L363}
///
// clang-format on
StatusOr<google::cloud::confidentialcomputing::v1::VerifyAttestationResponse>
Expand Down Expand Up @@ -209,8 +209,8 @@ class ConfidentialComputingClient {
/// [`future`]: @ref google::cloud::future
/// [`StatusOr`]: @ref google::cloud::StatusOr
/// [`Status`]: @ref google::cloud::Status
/// [google.cloud.confidentialcomputing.v1.VerifyConfidentialSpaceRequest]: @googleapis_reference_link{google/cloud/confidentialcomputing/v1/service.proto#L411}
/// [google.cloud.confidentialcomputing.v1.VerifyConfidentialSpaceResponse]: @googleapis_reference_link{google/cloud/confidentialcomputing/v1/service.proto#L493}
/// [google.cloud.confidentialcomputing.v1.VerifyConfidentialSpaceRequest]: @googleapis_reference_link{google/cloud/confidentialcomputing/v1/service.proto#L511}
/// [google.cloud.confidentialcomputing.v1.VerifyConfidentialSpaceResponse]: @googleapis_reference_link{google/cloud/confidentialcomputing/v1/service.proto#L598}
///
// clang-format on
StatusOr<
Expand Down Expand Up @@ -243,8 +243,8 @@ class ConfidentialComputingClient {
/// [`future`]: @ref google::cloud::future
/// [`StatusOr`]: @ref google::cloud::StatusOr
/// [`Status`]: @ref google::cloud::Status
/// [google.cloud.confidentialcomputing.v1.VerifyConfidentialGkeRequest]: @googleapis_reference_link{google/cloud/confidentialcomputing/v1/service.proto#L511}
/// [google.cloud.confidentialcomputing.v1.VerifyConfidentialGkeResponse]: @googleapis_reference_link{google/cloud/confidentialcomputing/v1/service.proto#L533}
/// [google.cloud.confidentialcomputing.v1.VerifyConfidentialGkeRequest]: @googleapis_reference_link{google/cloud/confidentialcomputing/v1/service.proto#L616}
/// [google.cloud.confidentialcomputing.v1.VerifyConfidentialGkeResponse]: @googleapis_reference_link{google/cloud/confidentialcomputing/v1/service.proto#L657}
///
// clang-format on
StatusOr<
Expand Down
Loading
Loading