Use new json connections file #374
Conversation
umohnani8
force-pushed
the
5.0-dev
branch
3 times, most recently
from
89bfff5
to
35b3643
Compare
umohnani8
force-pushed
the
5.0-dev
branch
5 times, most recently
from
51aec2f
to
bc2d540
Compare
Podman has updated where it will store its system connection information to a new json format file. Add support to podman-py to read from both the new json file and old toml file giving preference to the new json file. Signed-off-by: Urvashi Mohnani <[email protected]>
Signed-off-by: Urvashi Mohnani <[email protected]>
|
Tests are green! @jwhonce PTAL |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jwhonce, umohnani8 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 |
There was a problem hiding this comment.
A couple of notes:
This is not honouring CONTAINERS_CONF or CONTAINERS_CONF or PODMAN_CONNECTIONS_CONF env overwrites.
It does not support reading containers.conf.d
I am not saying these have to be fixed here but I wanted to list it. I am fine to leave them unfixed until a user complains.
| # this elif is only for testing purposes | ||
| elif "@@is_test@@" in path: | ||
| test_path = path.replace("@@is_test@@", '') | ||
| self.path = Path(test_path) / "podman-connections.json" | ||
| old_toml_file = Path(test_path) / "containers.conf" |
There was a problem hiding this comment.
this sounds like an ugly hack but I am not a python programmer so I don't really care if this is the right thing to solve it.
There was a problem hiding this comment.
I agree, I really dislike it too but I tried everything with the mock Env options but it just wouldn't pick up the env I was setting for XDG_CONFIG_HOME.
I can look into it further and open a PR in the future if I can figure it out.
Agreed, I think it might be best to call |
|
Let's see if I have some power here |
Podman has updated where it will store its
system connection information to a new json
format file.
Add support to podman-py to read from both the
new json file and old toml file giving preference
to the new json file.