Skip to content

Make --json output format same as it was before #479

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

Merged
andrewhassan merged 1 commit into from
May 16, 2025
Merged

Make --json output format same as it was before #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/container.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ pub struct BytesContainer {
#[serde(skip)]
pub codec: Codec,
/// The JSON represantation of the bytes.
#[serde(skip)]
#[serde(flatten)]
pub json_value: Option<serde_json::Value>,
/// The human readable representation of the bytes.
#[serde(skip)]
Copy link
Contributor

@saulecabrera saulecabrera May 16, 2025

Choose a reason for hiding this comment

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

I believe I introduced this for the codecs, but given that it's all json, maybe we should remove it while we are at it?

Copy link
Contributor Author

@adampetro adampetro May 16, 2025

Choose a reason for hiding this comment

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

We use the value here and here when the --json flag isn't passed

Copy link
Contributor

@saulecabrera saulecabrera May 16, 2025

Choose a reason for hiding this comment

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

Right, but this is mostly to accommodate the raw codec, for which we couldn't make any assumptions when the cli flag was exposed

function-runner/src/container.rs

Line 37 in 218f79f

humanized: "<raw codec>".into(),
e.g., we couldn't assume that it could be represented as json, for all the other cases, humanized is pretty much a json representation if I'm not wrong? So we could drop humanized and simply stringify the json directly. OTOH, maybe it's fine to keep it, and instead we should remove the Raw option from the codec which is what really complicates things here. I'll leave it up to you in this case.

Copy link
Contributor

@andrewhassan andrewhassan May 16, 2025

Choose a reason for hiding this comment

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

Yeah, we should probably remove the Raw codec. I'm fine doing that outside of this PR though.

pub humanized: String,
/// Context for encoding errors.
#[serde(skip)]
Expand Down
2 changes: 1 addition & 1 deletion tests/integration_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ mod tests {
.expect("Failed waiting for output");

cmd.assert().success();
cmd.assert().stdout(contains("\\\"test\\\": \\\"echo\\\""));
cmd.assert().stdout(contains("\"test\": \"echo\""));

Ok(())
}
Expand Down