Skip to content

deps: Bump protobuf and grpc#42435

Merged
yanavlasov merged 2 commits intoenvoyproxy:mainfrom
jwendell:bump-protobuf2
Dec 10, 2025
Merged

deps: Bump protobuf and grpc#42435
yanavlasov merged 2 commits intoenvoyproxy:mainfrom
jwendell:bump-protobuf2

Conversation

@jwendell
Copy link
Member

@jwendell jwendell commented Dec 5, 2025

No description provided.

Signed-off-by: Jonh Wendell <jwendell@redhat.com>
@repokitteh-read-only repokitteh-read-only bot added the deps Approval required for changes to Envoy's external dependencies label Dec 5, 2025
@repokitteh-read-only
Copy link

CC @envoyproxy/dependency-shepherds: Your approval is needed for changes made to (bazel/.*repos.*\.bzl)|(bazel/dependency_imports\.bzl)|(api/bazel/.*\.bzl)|(.*/requirements\.txt)|(.*\.patch).
envoyproxy/dependency-shepherds assignee is @agrawroh

🐱

Caused by: #42435 was opened by jwendell.

see: more, trace.

Copy link
Contributor

@yanavlasov yanavlasov left a comment

Choose a reason for hiding this comment

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

/wait-any

Copy link
Contributor

Choose a reason for hiding this comment

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

Do you know the cause of failure? I want to make sure we are not breaking this filter.

@sumitkmr2 @pranavrautgoogle can you help diagnosing the test failure with the new protobuf, please?

Copy link
Member Author

Choose a reason for hiding this comment

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

Copy link
Member Author

Choose a reason for hiding this comment

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

I've pushed a fix to this test and removed the FIXME.

Copy link
Contributor

Choose a reason for hiding this comment

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

Apologies, I was on leave. The fix looks good to me, thanks @jwendell for the fix!

}

- if (in_->BytesAvailable() < static_cast<pb::int64>(current_message_size_)) {
+ if (in_->BytesAvailable() < static_cast<int64_t>(current_message_size_)) {
Copy link
Contributor

Choose a reason for hiding this comment

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

@TAOXUY @nareddyt would it be possible to make this change in the grpc_httpjson_transcoding repo, please?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, I can go ahead and make this PR upstream today

@yanavlasov
Copy link
Contributor

/wait-any

Protobuf 33.1 changed DebugString() to produce unparseable output
(random prefixes, whitespace) for security reasons. The test was
using DebugString() to serialize a matcher proto then parsing it
with TextFormat::ParseFromString(), which now fails silently.

Replace DebugString() with TextFormat::PrintToString() which
produces proper text proto format.

Signed-off-by: Jonh Wendell <jwendell@redhat.com>
@jwendell
Copy link
Member Author

jwendell commented Dec 9, 2025

ping @envoyproxy/envoy-maintainers

@phlax
Copy link
Member

phlax commented Dec 9, 2025

@yanavlasov i think this waiting for further review

Copy link
Member

@agrawroh agrawroh left a comment

Choose a reason for hiding this comment

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

It looks good to me. I'm okay taking a patch in grpc_httpjson_transcoding until it gets upstreamed (we can have a tracking ticket).

Will let @yanavlasov give a final approval.

@repokitteh-read-only repokitteh-read-only bot removed the deps Approval required for changes to Envoy's external dependencies label Dec 9, 2025
@yanavlasov yanavlasov merged commit 863fbc7 into envoyproxy:main Dec 10, 2025
30 checks passed
dinesh-murugiah pushed a commit to dinesh-murugiah/envoy-redisproxy-improvements that referenced this pull request Dec 19, 2025
Signed-off-by: Jonh Wendell <jwendell@redhat.com>
Signed-off-by: dinesh-murugiah <dinesh.murugiah@freshworks.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

Comments