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

json: add null support to the streamer #36051

Merged
merged 13 commits into from
Sep 10, 2024

Conversation

wbpcode
Copy link
Member

@wbpcode wbpcode commented Sep 10, 2024

Commit Message: json: add null support to the streamer
Additional Description:

I initially think this is unnecessary. But when I retry to update the json formatter, I found this is still necessary.

Risk Level: low.
Testing: unit.
Docs Changes: n/a.
Release Notes: n/a.
Platform Specific Features: n/a.

@wbpcode
Copy link
Member Author

wbpcode commented Sep 10, 2024

wait on #36001 to be landed first.

@wbpcode
Copy link
Member Author

wbpcode commented Sep 10, 2024

cc @jmarantz

@wbpcode
Copy link
Member Author

wbpcode commented Sep 10, 2024

cc @alyssawilk it's here. I made the addWithoutSanitizing a private method directly.

Comment on lines 410 to 415
/**
* Adds a string to the output stream without sanitizing it. This is only used to push
* the delimeters to output buffer.
*/
void addWithoutSanitizing(absl::string_view str) { response_.add(str); }

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
Contributor

@jmarantz jmarantz left a comment

Choose a reason for hiding this comment

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

looks great w/ 2 nits.

source/common/json/json_streamer.h Show resolved Hide resolved
test/common/json/json_streamer_test.cc Show resolved Hide resolved
Signed-off-by: wangbaiping <[email protected]>
@wbpcode wbpcode merged commit 3f0517b into envoyproxy:main Sep 10, 2024
40 checks passed
@wbpcode wbpcode deleted the dev-make-streamer-support-null branch September 10, 2024 16:56
unicell added a commit to unicell/envoy that referenced this pull request Sep 11, 2024
* upstream/main: (21 commits)
  Add a CPU utilization resource monitor for overload manager (envoyproxy#34713)
  jwks: Add UA string to headers (envoyproxy#35977)
  exceptions: cleaning up macros (envoyproxy#35694)
  coverage: ratcheting (envoyproxy#36058)
  runtime: load rtds bool correctly as true/false instead of 1/0 (envoyproxy#36044)
  Typo in documentation of http original_src filter (envoyproxy#36060)
  docs: updating meeting info (envoyproxy#36052)
  quic: removes more references to spdy::Http2HeaderBlock. (envoyproxy#36057)
  json: add null support to the streamer (envoyproxy#36051)
  json: make the streamer a template class (envoyproxy#36001)
  docs: Add `apt.envoyproxy.io` install information (envoyproxy#36050)
  ext_proc: elide redundant copy in ext_proc filter factory callback (envoyproxy#36015)
  build(deps): bump yarl from 1.11.0 to 1.11.1 in /tools/base (envoyproxy#36049)
  build(deps): bump multidict from 6.0.5 to 6.1.0 in /tools/base (envoyproxy#36048)
  quic: enable certificate compression/decompression (envoyproxy#35999)
  Geoip fix asan failure (envoyproxy#36043)
  mobile: Fix missing logging output in Swift integration tests (envoyproxy#36040)
  http: minor code clean up to the http filter manager (envoyproxy#36027)
  ci/example: Dont build/test the filter example in Envoy CI (envoyproxy#36038)
  ci/codeql: Fix build setup (envoyproxy#36021)
  ...

Signed-off-by: Qiu Yu <[email protected]>
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.

3 participants