Skip to content

chore: update code to be compatible with protobuf v36 #16342

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

Draft
scotthart wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

chore: update code to be compatible with protobuf v36 #16342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dd796f9
chore: update code to be compatible with protobuf v36
scotthart Aug 11, 2026
ac61652
update protobuf dep to v36-rc2
scotthart Aug 11, 2026
bf843cd
more nodiscard updates
scotthart Aug 11, 2026
e577d2e
generator clang-tidy fixes
scotthart Aug 11, 2026
194bbf4
more unused variables
scotthart Aug 11, 2026
822343c
spanner unused vars
scotthart Aug 11, 2026
60fed99
use protobuf commit in bzlmod
scotthart Aug 13, 2026
b852f97
revert back to rc
scotthart Aug 13, 2026
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
7 changes: 6 additions & 1 deletion MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,12 @@ bazel_dep(name = "abseil-cpp", version = "20250814.2")
# The name "com_google_protobuf" is internally used by @bazel_tools,
# a native repository we cannot override.
# See https://github.com/googleapis/google-cloud-cpp/issues/15393
bazel_dep(name = "protobuf", version = "35.1", repo_name = "com_google_protobuf")
bazel_dep(name = "protobuf", version = "36.0-rc2", repo_name = "com_google_protobuf")
#git_override(
# module_name = "protobuf",
# commit = "d65ed10e49acbee0e7d14277ab3e0330a0dd2838",
# remote = "https://github.com/protocolbuffers/protobuf.git",
#)
bazel_dep(name = "boringssl", version = "0.20251124.0")
bazel_dep(name = "nlohmann_json", version = "3.12.0.bcr.1")
bazel_dep(name = "curl", version = "8.8.0.bcr.3")
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/demo-debian-bookworm.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ RUN curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250814.2.tar.gz |

# ```bash
WORKDIR /var/tmp/build/protobuf
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v33.6.tar.gz | \
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v36.0-rc2.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Debug \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/demo-debian-bullseye.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ RUN apt-get update && \

# ```bash
WORKDIR /var/tmp/build/protobuf
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v33.6.tar.gz | \
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v36.0-rc2.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Debug \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/demo-fedora.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ ENV PKG_CONFIG_PATH=/usr/local/share/pkgconfig:/usr/lib64/pkgconfig:/usr/local/l

# ```bash
WORKDIR /var/tmp/build/protobuf
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v33.6.tar.gz | \
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v36.0-rc2.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/demo-opensuse-leap.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ RUN curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250814.2.tar.gz |

# ```bash
WORKDIR /var/tmp/build/protobuf
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v33.6.tar.gz | \
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v36.0-rc2.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Debug \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/demo-rockylinux-9.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ RUN curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250814.2.tar.gz |

# ```bash
WORKDIR /var/tmp/build/protobuf
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v33.6.tar.gz | \
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v36.0-rc2.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Debug \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/demo-ubuntu-24.04.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ RUN curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250814.2.tar.gz |

# ```bash
WORKDIR /var/tmp/build/protobuf
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v33.6.tar.gz | \
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v36.0-rc2.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Debug \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/demo-ubuntu-jammy.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ RUN curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250814.2.tar.gz |

# ```bash
WORKDIR /var/tmp/build/protobuf
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v33.6.tar.gz | \
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v36.0-rc2.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Debug \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/fedora-cmake-quickstart.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ RUN curl -fsSL https://github.com/nlohmann/json/archive/v3.11.3.tar.gz | \
ldconfig && cd /var/tmp && rm -fr build

WORKDIR /var/tmp/build/protobuf
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v33.6.tar.gz | \
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v36.0-rc2.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/fedora-latest-cmake.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ RUN curl -fsSL https://github.com/nlohmann/json/archive/v3.11.3.tar.gz | \
ldconfig && cd /var/tmp && rm -fr build

WORKDIR /var/tmp/build/protobuf
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v33.6.tar.gz | \
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v36.0-rc2.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/fedora-latest-cxx20.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ RUN curl -fsSL https://github.com/nlohmann/json/archive/v3.11.3.tar.gz | \
cd /var/tmp && rm -fr build

WORKDIR /var/tmp/build/protobuf
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v33.6.tar.gz | \
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v36.0-rc2.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_CXX_STANDARD=20 \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/fedora-latest-publish-docs.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
ldconfig && cd /var/tmp && rm -fr build

WORKDIR /var/tmp/build/protobuf
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v33.6.tar.gz | \
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v36.0-rc2.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/gcc-oldest.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ RUN curl -fsSL https://github.com/google/benchmark/archive/v1.9.5.tar.gz | \
ldconfig && cd /var/tmp && rm -fr build

WORKDIR /var/tmp/build/protobuf
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v33.6.tar.gz | \
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v36.0-rc2.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/ubuntu-20.04-install.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ RUN curl -fsSL https://github.com/nlohmann/json/archive/v3.11.3.tar.gz | \


WORKDIR /var/tmp/build/protobuf
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v33.6.tar.gz | \
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v36.0-rc2.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/ubuntu-22.04-install.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ RUN curl -fsSL https://github.com/nlohmann/json/archive/v3.11.3.tar.gz | \


WORKDIR /var/tmp/build/protobuf
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v33.6.tar.gz | \
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v36.0-rc2.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down
14 changes: 7 additions & 7 deletions doc/packaging.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ export PKG_CONFIG_PATH=/usr/local/share/pkgconfig:/usr/lib64/pkgconfig:/usr/loca

```bash
mkdir -p $HOME/Downloads/protobuf && cd $HOME/Downloads/protobuf
curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v33.6.tar.gz | \
curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v36.0-rc2.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down Expand Up @@ -421,7 +421,7 @@ sudo ldconfig

```bash
mkdir -p $HOME/Downloads/protobuf && cd $HOME/Downloads/protobuf
curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v33.6.tar.gz | \
curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v36.0-rc2.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Debug \
Expand Down Expand Up @@ -594,7 +594,7 @@ sudo ldconfig

```bash
mkdir -p $HOME/Downloads/protobuf && cd $HOME/Downloads/protobuf
curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v33.6.tar.gz | \
curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v36.0-rc2.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Debug \
Expand Down Expand Up @@ -740,7 +740,7 @@ Google Cloud Platform proto files:

```bash
mkdir -p $HOME/Downloads/protobuf && cd $HOME/Downloads/protobuf
curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v33.6.tar.gz | \
curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v36.0-rc2.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Debug \
Expand Down Expand Up @@ -907,7 +907,7 @@ sudo ldconfig

```bash
mkdir -p $HOME/Downloads/protobuf && cd $HOME/Downloads/protobuf
curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v33.6.tar.gz | \
curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v36.0-rc2.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Debug \
Expand Down Expand Up @@ -1072,7 +1072,7 @@ to build from source:

```bash
mkdir -p $HOME/Downloads/protobuf && cd $HOME/Downloads/protobuf
curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v33.6.tar.gz | \
curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v36.0-rc2.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Debug \
Expand Down Expand Up @@ -1249,7 +1249,7 @@ install Protobuf (and any downstream packages) from source.

```bash
mkdir -p $HOME/Downloads/protobuf && cd $HOME/Downloads/protobuf
curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v33.6.tar.gz | \
curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v36.0-rc2.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Debug \
Expand Down
1 change: 0 additions & 1 deletion generator/integration_tests/tests/golden_kitchen_sink_stub_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,6 @@ class MockWriteObjectResponse

TEST_F(GoldenKitchenSinkStubTest, StreamingWrite) {
auto context = std::make_shared<grpc::ClientContext>();
Request request;
EXPECT_CALL(*grpc_stub_, StreamingWriteRaw(context.get(), _))
.WillOnce([](::grpc::ClientContext*, Response*) {
auto stream = std::make_unique<MockWriteObjectResponse>();
Expand Down
27 changes: 12 additions & 15 deletions generator/integration_tests/tests/golden_thing_admin_connection_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ TEST(GoldenThingAdminConnectionTest, ListDatabases) {

::google::test::admin::database::v1::ListDatabasesResponse page;
page.set_next_page_token("page-1");
::google::test::admin::database::v1::Database database;
page.add_databases()->set_name("db-1");
page.add_databases()->set_name("db-2");
return make_status_or(page);
Expand All @@ -112,7 +111,6 @@ TEST(GoldenThingAdminConnectionTest, ListDatabases) {

::google::test::admin::database::v1::ListDatabasesResponse page;
page.set_next_page_token("page-2");
::google::test::admin::database::v1::Database database;
page.add_databases()->set_name("db-3");
page.add_databases()->set_name("db-4");
return make_status_or(page);
Expand All @@ -127,7 +125,6 @@ TEST(GoldenThingAdminConnectionTest, ListDatabases) {

::google::test::admin::database::v1::ListDatabasesResponse page;
page.clear_next_page_token();
::google::test::admin::database::v1::Database database;
page.add_databases()->set_name("db-5");
return make_status_or(page);
});
Expand Down Expand Up @@ -195,7 +192,7 @@ TEST(GoldenThingAdminConnectionTest, CreateDatabaseSuccess) {
op.set_done(true);
::google::test::admin::database::v1::Database database;
database.set_name("test-database");
op.mutable_response()->PackFrom(database);
(void)op.mutable_response()->PackFrom(database);
return make_ready_future(make_status_or(op));
});
auto conn = CreateTestingConnection(std::move(mock));
Expand Down Expand Up @@ -248,7 +245,7 @@ TEST(GoldenThingAdminConnectionTest, CreateDatabaseStartAwait) {
google::longrunning::Operation expected_operation;
expected_operation.set_name("test-operation-name");
google::test::admin::database::v1::CreateDatabaseMetadata metadata;
expected_operation.mutable_metadata()->PackFrom(metadata);
(void)expected_operation.mutable_metadata()->PackFrom(metadata);

EXPECT_CALL(*mock, CreateDatabase(_, _, _)).WillOnce([&] {
return make_status_or(expected_operation);
Expand All @@ -263,7 +260,7 @@ TEST(GoldenThingAdminConnectionTest, CreateDatabaseStartAwait) {
op.set_done(true);
::google::test::admin::database::v1::Database database;
database.set_name("test-database");
op.mutable_response()->PackFrom(database);
(void)op.mutable_response()->PackFrom(database);
return make_ready_future(make_status_or(op));
});

Expand Down Expand Up @@ -364,7 +361,7 @@ TEST(GoldenThingAdminConnectionTest, UpdateDatabaseDdlSuccess) {
op.set_done(true);
::google::test::admin::database::v1::UpdateDatabaseDdlMetadata metadata;
metadata.set_database("test-database");
op.mutable_metadata()->PackFrom(metadata);
(void)op.mutable_metadata()->PackFrom(metadata);
return make_ready_future(make_status_or(op));
});
auto conn = CreateTestingConnection(std::move(mock));
Expand Down Expand Up @@ -421,7 +418,7 @@ TEST(GoldenThingAdminConnectionTest, UpdateDatabaseDdlStartAwait) {
google::longrunning::Operation expected_operation;
expected_operation.set_name("test-operation-name");
google::test::admin::database::v1::UpdateDatabaseDdlMetadata metadata;
expected_operation.mutable_metadata()->PackFrom(metadata);
(void)expected_operation.mutable_metadata()->PackFrom(metadata);

EXPECT_CALL(*mock, UpdateDatabaseDdl(_, _, _)).WillOnce([&] {
return make_status_or(expected_operation);
Expand All @@ -436,7 +433,7 @@ TEST(GoldenThingAdminConnectionTest, UpdateDatabaseDdlStartAwait) {
op.set_done(true);
::google::test::admin::database::v1::UpdateDatabaseDdlMetadata metadata;
metadata.set_database("test-database");
op.mutable_metadata()->PackFrom(metadata);
(void)op.mutable_metadata()->PackFrom(metadata);
return make_ready_future(make_status_or(op));
});

Expand Down Expand Up @@ -787,7 +784,7 @@ TEST(GoldenThingAdminConnectionTest, CreateBackupSuccess) {
op.set_done(true);
::google::test::admin::database::v1::Backup backup;
backup.set_name("test-backup");
op.mutable_response()->PackFrom(backup);
(void)op.mutable_response()->PackFrom(backup);
return make_ready_future(make_status_or(op));
});
auto conn = CreateTestingConnection(std::move(mock));
Expand Down Expand Up @@ -843,7 +840,7 @@ TEST(GoldenThingAdminConnectionTest, CreateBackupStartAwait) {
google::longrunning::Operation expected_operation;
expected_operation.set_name("test-operation-name");
google::test::admin::database::v1::CreateBackupMetadata metadata;
expected_operation.mutable_metadata()->PackFrom(metadata);
(void)expected_operation.mutable_metadata()->PackFrom(metadata);

EXPECT_CALL(*mock, CreateBackup(_, _, _)).WillOnce([&] {
return make_status_or(expected_operation);
Expand All @@ -858,7 +855,7 @@ TEST(GoldenThingAdminConnectionTest, CreateBackupStartAwait) {
op.set_done(true);
::google::test::admin::database::v1::Backup backup;
backup.set_name("test-backup");
op.mutable_response()->PackFrom(backup);
(void)op.mutable_response()->PackFrom(backup);
return make_ready_future(make_status_or(op));
});

Expand Down Expand Up @@ -1155,7 +1152,7 @@ TEST(GoldenThingAdminConnectionTest, RestoreDatabaseSuccess) {
op.set_done(true);
::google::test::admin::database::v1::Database database;
database.set_name("test-database");
op.mutable_response()->PackFrom(database);
(void)op.mutable_response()->PackFrom(database);
return make_ready_future(make_status_or(op));
});
auto conn = CreateTestingConnection(std::move(mock));
Expand Down Expand Up @@ -1213,7 +1210,7 @@ TEST(GoldenThingAdminConnectionTest, RestoreDatabaseStartAwait) {
google::longrunning::Operation expected_operation;
expected_operation.set_name("test-operation-name");
google::test::admin::database::v1::RestoreDatabaseMetadata metadata;
expected_operation.mutable_metadata()->PackFrom(metadata);
(void)expected_operation.mutable_metadata()->PackFrom(metadata);

EXPECT_CALL(*mock, RestoreDatabase(_, _, _)).WillOnce([&] {
return make_status_or(expected_operation);
Expand All @@ -1228,7 +1225,7 @@ TEST(GoldenThingAdminConnectionTest, RestoreDatabaseStartAwait) {
op.set_done(true);
::google::test::admin::database::v1::Database database;
database.set_name("test-database");
op.mutable_response()->PackFrom(database);
(void)op.mutable_response()->PackFrom(database);
return make_ready_future(make_status_or(op));
});

Expand Down
Loading
Loading