Skip to content

Commit 4dc40e9

Browse files
devbwwdevbww
authored
chore: update googleapis SHA circa 2022-09-15 (#9860)
Mostly to pick up `{Create,Update,Delete}InstanceConfig()` for the `spanner_admin::InstanceAdminClient`. This should allow us to merge the "CMMR Phase 2" work.
1 parent 0eff8b0 commit 4dc40e9

39 files changed

Lines changed: 1412 additions & 154 deletions

‎bazel/google_cloud_cpp_deps.bzl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ def google_cloud_cpp_deps():
8585
http_archive(
8686
name = "com_google_googleapis",
8787
urls = [
88-
"https://github.com/googleapis/googleapis/archive/565a5508869557a3228b871101e4e4ebd8f93d11.tar.gz",
89-
"https://storage.googleapis.com/cloud-cpp-community-archive/com_google_googleapis/565a5508869557a3228b871101e4e4ebd8f93d11.tar.gz",
88+
"https://github.com/googleapis/googleapis/archive/5a9ee4d5deca8e3da550b0419ed336e22521fc8e.tar.gz",
89+
"https://storage.googleapis.com/cloud-cpp-community-archive/com_google_googleapis/5a9ee4d5deca8e3da550b0419ed336e22521fc8e.tar.gz",
9090
],
91-
strip_prefix = "googleapis-565a5508869557a3228b871101e4e4ebd8f93d11",
92-
sha256 = "b304ad01bb6ef65d5ca3519da81db33b5caacccbf1d22dbcef677e87416e76eb",
91+
strip_prefix = "googleapis-5a9ee4d5deca8e3da550b0419ed336e22521fc8e",
92+
sha256 = "57ff2830ff96329e83a349757f694885c4addc2a8791120f6f7447f86daae680",
9393
build_file = "@com_github_googleapis_google_cloud_cpp//bazel:googleapis.BUILD",
9494
# Scaffolding for patching googleapis after download. For example:
9595
# patches = ["googleapis.patch"]

‎cmake/GoogleapisConfig.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
# Give application developers a hook to configure the version and hash
1818
# downloaded from GitHub.
1919
set(GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA
20-
"565a5508869557a3228b871101e4e4ebd8f93d11"
20+
"5a9ee4d5deca8e3da550b0419ed336e22521fc8e"
2121
CACHE STRING "Configure the commit SHA (or tag) for the googleapis protos.")
2222
mark_as_advanced(GOOGLE_CLOUD_CPP_GOOGLEAPIS_SHA)
2323
set(GOOGLE_CLOUD_CPP_GOOGLEAPIS_SHA256
24-
"b304ad01bb6ef65d5ca3519da81db33b5caacccbf1d22dbcef677e87416e76eb"
24+
"57ff2830ff96329e83a349757f694885c4addc2a8791120f6f7447f86daae680"
2525
CACHE STRING "Configure the SHA256 checksum of the googleapis tarball.")
2626
mark_as_advanced(GOOGLE_CLOUD_CPP_GOOGLEAPIS_SHA256)
2727

‎external/googleapis/protolists/spanner.list‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@com_google_googleapis//google/spanner/admin/database/v1:backup.proto
22
@com_google_googleapis//google/spanner/admin/database/v1:common.proto
33
@com_google_googleapis//google/spanner/admin/database/v1:spanner_database_admin.proto
4+
@com_google_googleapis//google/spanner/admin/instance/v1:common.proto
45
@com_google_googleapis//google/spanner/admin/instance/v1:spanner_instance_admin.proto
56
@com_google_googleapis//google/spanner/v1:commit_response.proto
67
@com_google_googleapis//google/spanner/v1:keys.proto

‎generator/internal/descriptor_utils.cc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,11 @@ std::string FormatApiMethodSignatureParameters(
466466
// Doxygen cannot process this tag. One proto uses it in a comment.
467467
{"<tbody>", "<!--<tbody>-->"},
468468
{"</tbody>", "<!--</tbody>-->"},
469+
// Unescaped elements in spanner_instance_admin.proto.
470+
{" <parent>/instanceConfigs/us-east1,",
471+
" `<parent>/instanceConfigs/us-east1`,"},
472+
{" <parent>/instanceConfigs/nam3.",
473+
" `<parent>/instanceConfigs/nam3`."},
469474
});
470475
absl::StrAppendFormat(&parameter_comments, " /// @param %s %s\n",
471476
FieldName(parameter_descriptor), std::move(comment));

‎google/cloud/bigtable/admin/bigtable_table_admin_client.cc‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,25 @@ StatusOr<google::bigtable::admin::v2::Table> BigtableTableAdminClient::GetTable(
8282
return connection_->GetTable(request);
8383
}
8484

85+
future<StatusOr<google::bigtable::admin::v2::Table>>
86+
BigtableTableAdminClient::UpdateTable(
87+
google::bigtable::admin::v2::Table const& table,
88+
google::protobuf::FieldMask const& update_mask, Options opts) {
89+
internal::OptionsSpan span(internal::MergeOptions(std::move(opts), options_));
90+
google::bigtable::admin::v2::UpdateTableRequest request;
91+
*request.mutable_table() = table;
92+
*request.mutable_update_mask() = update_mask;
93+
return connection_->UpdateTable(request);
94+
}
95+
96+
future<StatusOr<google::bigtable::admin::v2::Table>>
97+
BigtableTableAdminClient::UpdateTable(
98+
google::bigtable::admin::v2::UpdateTableRequest const& request,
99+
Options opts) {
100+
internal::OptionsSpan span(internal::MergeOptions(std::move(opts), options_));
101+
return connection_->UpdateTable(request);
102+
}
103+
85104
Status BigtableTableAdminClient::DeleteTable(std::string const& name,
86105
Options opts) {
87106
internal::OptionsSpan span(internal::MergeOptions(std::move(opts), options_));

‎google/cloud/bigtable/admin/bigtable_table_admin_client.h‎

Lines changed: 123 additions & 74 deletions
Large diffs are not rendered by default.

‎google/cloud/bigtable/admin/bigtable_table_admin_connection.cc‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,14 @@ BigtableTableAdminConnection::GetTable(
5555
return Status(StatusCode::kUnimplemented, "not implemented");
5656
}
5757

58+
future<StatusOr<google::bigtable::admin::v2::Table>>
59+
BigtableTableAdminConnection::UpdateTable(
60+
google::bigtable::admin::v2::UpdateTableRequest const&) {
61+
return google::cloud::make_ready_future<
62+
StatusOr<google::bigtable::admin::v2::Table>>(
63+
Status(StatusCode::kUnimplemented, "not implemented"));
64+
}
65+
5866
Status BigtableTableAdminConnection::DeleteTable(
5967
google::bigtable::admin::v2::DeleteTableRequest const&) {
6068
return Status(StatusCode::kUnimplemented, "not implemented");

‎google/cloud/bigtable/admin/bigtable_table_admin_connection.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ class BigtableTableAdminConnection {
7676
virtual StatusOr<google::bigtable::admin::v2::Table> GetTable(
7777
google::bigtable::admin::v2::GetTableRequest const& request);
7878

79+
virtual future<StatusOr<google::bigtable::admin::v2::Table>> UpdateTable(
80+
google::bigtable::admin::v2::UpdateTableRequest const& request);
81+
7982
virtual Status DeleteTable(
8083
google::bigtable::admin::v2::DeleteTableRequest const& request);
8184

‎google/cloud/bigtable/admin/bigtable_table_admin_connection_idempotency_policy.cc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@ class DefaultBigtableTableAdminConnectionIdempotencyPolicy
5858
return Idempotency::kIdempotent;
5959
}
6060

61+
Idempotency UpdateTable(
62+
google::bigtable::admin::v2::UpdateTableRequest const&) override {
63+
return Idempotency::kNonIdempotent;
64+
}
65+
6166
Idempotency DeleteTable(
6267
google::bigtable::admin::v2::DeleteTableRequest const&) override {
6368
return Idempotency::kNonIdempotent;

‎google/cloud/bigtable/admin/bigtable_table_admin_connection_idempotency_policy.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ class BigtableTableAdminConnectionIdempotencyPolicy {
4747
virtual google::cloud::Idempotency GetTable(
4848
google::bigtable::admin::v2::GetTableRequest const& request) = 0;
4949

50+
virtual google::cloud::Idempotency UpdateTable(
51+
google::bigtable::admin::v2::UpdateTableRequest const& request) = 0;
52+
5053
virtual google::cloud::Idempotency DeleteTable(
5154
google::bigtable::admin::v2::DeleteTableRequest const& request) = 0;
5255

0 commit comments

Comments
 (0)