make podman pod inspect output a json array #21514
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
openshift-ci
bot
added
release-note
approved
vrothberg
approved these changes
Feb 5, 2024
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: Luap99, vrothberg 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 |
Luap99
added
breaking-change
|
/lgtm |
openshift-ci
bot
added
the
do-not-merge/hold
|
Cockpit tests failed for commit ca8ba47bc1b39a488f74139cc151d938af3b863a. @martinpitt, @jelly, @mvollmer please check. |
Just like all the other inspect commands that accept multiple args we should just make podman pod inspect output a json array. This makes the code more consistent and removes the extra workaround which was needed before to support this. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Luap99
force-pushed
the
pod-inspect-output
branch
from
ca8ba47
to
35d1f12
Compare
|
Cockpit tests failed for commit 35d1f12. @martinpitt, @jelly, @mvollmer please check. |
|
Looks like this change breaks cockpit. |
|
If cockpit uses the podman pod inspect command then yes it likely breaks the json parser but because this is a intentional breaking change this is expected and good to merge as we agreed the cockpit tests are not a blocker for such changes and that they need to fix the test on their end. That however only makes sense when this PR is merged as otherwise they would break all other PRs tests. |
|
/unhold |
openshift-ci
bot
removed
the
do-not-merge/hold
martinpitt
added a commit
to martinpitt/cockpit-podman
that referenced
this pull request
Feb 7, 2024
The "as we do not show them in the UI yet" is not true any more, the code above does just that. This avoids assuming that `podman inspect` returns a JSON object. containers/podman#21514 changes it to a list, so the test fails with "list indices must be integers or slices, not str" with that PR.
martinpitt
added a commit
to martinpitt/cockpit-podman
that referenced
this pull request
Feb 7, 2024
The "as we do not show them in the UI yet" is not true any more, the code above does just that. This avoids assuming that `podman inspect` returns a JSON object. containers/podman#21514 changes it to a list, so the test fails with "list indices must be integers or slices, not str" with that PR.
|
@Luap99 @vrothberg I sent cockpit-project/cockpit-podman#1549 to adjust cockpit's tests. It should land in the next 3 hours, then I'll ping here. |
jelly
pushed a commit
to cockpit-project/cockpit-podman
that referenced
this pull request
Feb 7, 2024
The "as we do not show them in the UI yet" is not true any more, the code above does just that. This avoids assuming that `podman inspect` returns a JSON object. containers/podman#21514 changes it to a list, so the test fails with "list indices must be integers or slices, not str" with that PR.
|
@Luap99 @vrothberg The cockpit PR landed, so can you please retry? They should go green now. |
|
Retriggered the jobs. That was super fast, thanks a lot, @martinpitt ! |
|
please merge this |
|
/lgtm |
openshift-merge-bot
bot
merged commit 4c9bd24
into
containers:main
91 of 92 checks passed
|
This also broke ansible-podman-collections, see containers/ansible-podman-collections#712 . |
AdamWill
added a commit
to AdamWill/ansible-podman-collections
that referenced
this pull request
Feb 16, 2024
Podman 5 changed the output of `podman pod info` (when run on a single pod) from being a dict to being a list of dicts: containers/podman#21514 this should handle both ways. Unfortunately not sure how to add a test for this as I can't see a unit test that mocks the output of the command, only the integration test that gets real live output, and I'm not sure how to get that test run with Podman 5. Signed-off-by: Adam Williamson <awilliam@redhat.com>
AdamWill
added a commit
to AdamWill/ansible-podman-collections
that referenced
this pull request
Feb 16, 2024
Fixes containers#712 Podman 5 changed the output of `podman pod info` (when run on a single pod) from being a dict to being a list of dicts: containers/podman#21514 this should handle both ways. Unfortunately not sure how to add a test for this as I can't see a unit test that mocks the output of the command, only the integration test that gets real live output, and I'm not sure how to get that test run with Podman 5. Signed-off-by: Adam Williamson <awilliam@redhat.com>
sshnaidm
pushed a commit
to containers/ansible-podman-collections
that referenced
this pull request
Feb 17, 2024
Fixes #712 Podman 5 changed the output of `podman pod info` (when run on a single pod) from being a dict to being a list of dicts: containers/podman#21514 this should handle both ways. Unfortunately not sure how to add a test for this as I can't see a unit test that mocks the output of the command, only the integration test that gets real live output, and I'm not sure how to get that test run with Podman 5. Signed-off-by: Adam Williamson <awilliam@redhat.com>
sshnaidm
added a commit
to sshnaidm/ansible-podman-collections
that referenced
this pull request
Feb 17, 2024
Fix breakig change introduced in Podman v5: containers/podman#21514 Related-to: containers#712 Signed-off-by: Sagi Shnaidman <sshnaidm@redhat.com>
sshnaidm
added a commit
to containers/ansible-podman-collections
that referenced
this pull request
Feb 17, 2024
Fix breakig change introduced in Podman v5: containers/podman#21514 Related-to: #712 Signed-off-by: Sagi Shnaidman <sshnaidm@redhat.com>
sshnaidm
added a commit
to sshnaidm/ansible-podman-collections
that referenced
this pull request
Feb 18, 2024
Fixing issue from: containers/podman#21514 Signed-off-by: Sagi Shnaidman <sshnaidm@redhat.com>
sshnaidm
added a commit
to containers/ansible-podman-collections
that referenced
this pull request
Feb 18, 2024
Fixing issue from: containers/podman#21514 Signed-off-by: Sagi Shnaidman <sshnaidm@redhat.com>
stale-locking-app
bot
added
the
locked - please file new issue/PR
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Just like all the other inspect commands that accept multiple args we should just make podman pod inspect output a json array. This makes the code more consistent and removes the extra workaround which was needed before to support this.
Does this PR introduce a user-facing change?