kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Replace olekukonko/tablewriter with cheynewallace/tabby

Browse Source 
- Closes #1497
- Closes #1498

This library is simpler and doesn't produce extraneous whitespace around
the output.

A local helper function restores "--" for empty output.

Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
Jonathon Anderson
2024-11-07 16:17:40 -07:00
parent 3cbb295e7b
commit a8554b0af5
11 changed files with 194 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
internal/app/wwctl/container/list/main.go
View File

@@ -5,17 +5,18 @@ import (
"time"
"github.com/spf13/cobra"
"github.com/warewulf/warewulf/internal/app/wwctl/helper"
"github.com/warewulf/warewulf/internal/app/wwctl/table"
apicontainer "github.com/warewulf/warewulf/internal/pkg/api/container"
"github.com/warewulf/warewulf/internal/pkg/container"
"github.com/warewulf/warewulf/internal/pkg/util"
"github.com/warewulf/warewulf/internal/pkg/wwlog"
)
var containerList = apicontainer.ContainerList
func CobraRunE(vars *variables) func(cmd *cobra.Command, args []string) (err error) {
return func(cmd *cobra.Command, args []string) (err error) {
t := table.New(cmd.OutOrStdout())
showSize := vars.size || vars.chroot || vars.compressed
if showSize || vars.full || vars.kernel {
containerInfo, err := containerList()
@@ -23,7 +24,7 @@ func CobraRunE(vars *variables) func(cmd *cobra.Command, args []string) (err err
return err
}
if vars.full {
ph := helper.New([]string{"CONTAINER NAME", "NODES", "KERNEL VERSION", "CREATION TIME", "MODIFICATION TIME", "SIZE"})
t.AddHeader("CONTAINER NAME", "NODES", "KERNEL VERSION", "CREATION TIME", "MODIFICATION TIME", "SIZE")
for i := 0; i < len(containerInfo); i++ {
createTime := time.Unix(int64(containerInfo[i].CreateDate), 0)
modTime := time.Unix(int64(containerInfo[i].ModDate), 0)
@@ -34,30 +35,26 @@ func CobraRunE(vars *variables) func(cmd *cobra.Command, args []string) (err err
if vars.chroot {
sz = util.ByteToString(int64(containerInfo[i].Size))
}
ph.Append([]string{
t.AddLine(
containerInfo[i].Name,
strconv.FormatUint(uint64(containerInfo[i].NodeCount), 10),
containerInfo[i].KernelVersion,
createTime.Format(time.RFC822),
modTime.Format(time.RFC822),
sz,
})
)
}
ph.Render()
wwlog.Info("%s", ph.String())
} else if vars.kernel {
ph := helper.New([]string{"CONTAINER NAME", "NODES", "KERNEL VERSION"})
t.AddHeader("CONTAINER NAME", "NODES", "KERNEL VERSION")
for i := 0; i < len(containerInfo); i++ {
ph.Append([]string{
t.AddLine(
containerInfo[i].Name,
strconv.FormatUint(uint64(containerInfo[i].NodeCount), 10),
containerInfo[i].KernelVersion,
})
)
}
ph.Render()
wwlog.Info("%s", ph.String())
} else if showSize {
ph := helper.New([]string{"CONTAINER NAME", "NODES", "SIZE"})
t.AddHeader("CONTAINER NAME", "NODES", "SIZE")
for i := 0; i < len(containerInfo); i++ {
sz := util.ByteToString(int64(containerInfo[i].ImgSize))
if vars.compressed {
@@ -67,24 +64,21 @@ func CobraRunE(vars *variables) func(cmd *cobra.Command, args []string) (err err
sz = util.ByteToString(int64(containerInfo[i].Size))
}
ph.Append([]string{
t.AddLine(
containerInfo[i].Name,
strconv.FormatUint(uint64(containerInfo[i].NodeCount), 10),
sz,
})
)
}
ph.Render()
wwlog.Info("%s", ph.String())
}
} else {
ph := helper.New([]string{"CONTAINER NAME"})
t.AddHeader("CONTAINER NAME")
list, _ := container.ListSources()
for _, cont := range list {
ph.Append([]string{cont})
t.AddLine(cont)
}
ph.Render()
wwlog.Info("%s", ph.String())
}
t.Print()
return
}
}

15
internal/app/wwctl/container/list/main_test.go
View File

@@ -24,8 +24,11 @@ func Test_List(t *testing.T) {
{
name: "container list test",
args: []string{"-l"},
stdout: ` CONTAINER NAME NODES KERNEL VERSION CREATION TIME MODIFICATION TIME SIZE
test 1 kernel`,
stdout: `
CONTAINER NAME NODES KERNEL VERSION CREATION TIME MODIFICATION TIME SIZE
-------------- ----- -------------- ------------- ----------------- ----
test 1 kernel 01 Jan 70 00:00 UTC 01 Jan 70 00:00 UTC 0 B
`,
inDb: `WW_INTERNAL: 43
nodeprofiles:
default: {}
@@ -61,14 +64,12 @@ nodes:
buf := new(bytes.Buffer)
baseCmd := GetCommand()
baseCmd.SetArgs(tt.args)
baseCmd.SetOut(nil)
baseCmd.SetErr(nil)
baseCmd.SetOut(buf)
baseCmd.SetErr(buf)
wwlog.SetLogWriter(buf)
err := baseCmd.Execute()
assert.NoError(t, err)
assert.Contains(t,
strings.Join(strings.Fields(buf.String()), ""),
strings.Join(strings.Fields(tt.stdout), ""))
assert.Equal(t, strings.TrimSpace(tt.stdout), strings.TrimSpace(buf.String()))
})
}
}