cmd/snap: add 'debug paths' command #5459
Conversation
Add `snap debug paths` command that shows paths that have been detected for the system. Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
cmd/snap/cmd_paths.go
Outdated
| w := tabWriter() | ||
| defer w.Flush() | ||
|
|
||
| // TODO: include paths reported by snap-confine |
There was a problem hiding this comment.
It'd be great to have a way to interrogate s-c get back whatever was passed as --with-snap-mount-dir, --libexecdir and maybe --with-32bit-libdir and include it in the output here.
There was a problem hiding this comment.
That is interesting, yes (for as long as there are hard-coded assumptions in snap-confine)
There was a problem hiding this comment.
It'd be better to fix it instead of interrogating it, though.
Codecov Report
@@ Coverage Diff @@
## master #5459 +/- ##
==========================================
+ Coverage 79.01% 79.02% +0.01%
==========================================
Files 512 513 +1
Lines 38674 38701 +27
==========================================
+ Hits 30557 30584 +27
Misses 5664 5664
Partials 2453 2453
Continue to review full report at Codecov.
|
|
@bboozzoo one last request, please add a simple spread test. |
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
cmd/snap/cmd_paths.go
Outdated
| w := tabWriter() | ||
| defer w.Flush() | ||
|
|
||
| // TODO: include paths reported by snap-confine |
There was a problem hiding this comment.
Per note above, let's please not do this and drop the TODO. For two reasons:
- The snap-confine bundled with snapd should use the same paths as the snapd and snap binary that shipped with it, so we can interrogate those instead for the same result (note we're not querying snapd either here).
- We should fix snap-confine to use paths dynamically if/when it needs to.
cmd/snap/cmd_paths.go
Outdated
| {"snap-bin-dir", dirs.SnapBinariesDir}, | ||
| {"distro-libexec", dirs.DistroLibExecDir}, | ||
| } { | ||
| fmt.Fprintf(w, "%s:\t%s\n", p.name, p.path) |
There was a problem hiding this comment.
A format like this might be better here:
SNAPD_MOUNT=...
SNAPD_BIN=...
SNAPD_LIBEXEC=...
This allows usage in shell for analysis, and it also uses the $SNAPD_ prefix, which is what we generally have for snapd-related content. We usually reserve the $SNAP_ prefix for things which are for a snap, with $SNAP being the path to the snap directory under /snap. We also don't use DIR for $SNAP*, so we don't need it here either.
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
… output Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
cmd/snap/cmd_paths.go
Outdated
| return ErrExtraArgs | ||
| } | ||
|
|
||
| w := tabWriter() |
There was a problem hiding this comment.
We don't need a tabWriter anymore, do we? The new code is not writing tabs anymore AFAICT.
| } | ||
|
|
||
| func (s *SnapSuite) TestPathsFedora(c *C) { | ||
| restore := release.MockReleaseInfo(&release.OS{ID: "fedora"}) |
| snap debug paths | MATCH "^SNAPD_LIBEXEC=${LIBEXECDIR}/snapd$" | ||
|
|
||
| # double check we can eval it as shell | ||
| eval "$(snap debug paths)" |
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
Add
snap debug pathscommand that shows paths that have been detected for thesystem. This currently includes: