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

Output Size and Reclaimable in human form for json output #16904

Merged
merged 1 commit into from
Dec 22, 2022

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Dec 20, 2022

Signed-off-by: Daniel J Walsh [email protected]

Fixes: #16902

Does this PR introduce a user-facing change?

Improve podman system df --format "{{ json . }}"  format to match docker output 

@openshift-ci openshift-ci bot added release-note do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Dec 20, 2022
@rhatdan rhatdan changed the title [WIP] Output Size and Reclaimable in human form for json output Output Size and Reclaimable in human form for json output Dec 20, 2022
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 20, 2022
@rhatdan
Copy link
Member Author

rhatdan commented Dec 20, 2022

@Luap99 PTAL

@rhatdan
Copy link
Member Author

rhatdan commented Dec 22, 2022

@containers/podman-maintainers PTAL
@vrothberg @giuseppe @flouthoc PTAL

@mheon
Copy link
Member

mheon commented Dec 22, 2022

LGTM

Copy link
Member

@giuseppe giuseppe left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 22, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 22, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: giuseppe, rhatdan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit 9fbf918 into containers:main Dec 22, 2022
@@ -145,6 +146,7 @@ func printSummary(cmd *cobra.Command, reports *entities.SystemDfReport) error {

rpt := report.New(os.Stdout, cmd.Name())
defer rpt.Flush()
report.DefaultFuncs["json"] = rptJSON
Copy link
Member

Choose a reason for hiding this comment

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

This looks like bad code style, we should not modify the global variable in a different package like that. It will work here because we exit after that but if we start adding another report template after that it will cause bugs.

I will create a PR with better fix

@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 16, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 16, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. release-note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

podman system df --format '{{json .}}' is not compliant with docker output
5 participants