From e99e8c3dbbbd781a8c92924d9713c66b2f65d786 Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Wed, 25 Sep 2024 13:35:06 -0600 Subject: [PATCH] Update use of wwlog.Info to specify a format string Since wwlog.Info() expect a format string, accidental inclusion of a format string in the payload causes an error. See also #1382, #1363 Signed-off-by: Jonathon Anderson --- internal/app/wwctl/container/list/main.go | 8 ++++---- internal/app/wwctl/node/list/main.go | 2 +- internal/app/wwctl/profile/list/main.go | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/app/wwctl/container/list/main.go b/internal/app/wwctl/container/list/main.go index e94d88a5..8e91e1f3 100644 --- a/internal/app/wwctl/container/list/main.go +++ b/internal/app/wwctl/container/list/main.go @@ -44,7 +44,7 @@ func CobraRunE(vars *variables) func(cmd *cobra.Command, args []string) (err err }) } ph.Render() - wwlog.Info(ph.String()) + wwlog.Info("%s", ph.String()) } else if vars.kernel { ph := helper.New([]string{"CONTAINER NAME", "NODES", "KERNEL VERSION"}) for i := 0; i < len(containerInfo); i++ { @@ -55,7 +55,7 @@ func CobraRunE(vars *variables) func(cmd *cobra.Command, args []string) (err err }) } ph.Render() - wwlog.Info(ph.String()) + wwlog.Info("%s", ph.String()) } else if showSize { ph := helper.New([]string{"CONTAINER NAME", "NODES", "SIZE"}) for i := 0; i < len(containerInfo); i++ { @@ -74,7 +74,7 @@ func CobraRunE(vars *variables) func(cmd *cobra.Command, args []string) (err err }) } ph.Render() - wwlog.Info(ph.String()) + wwlog.Info("%s", ph.String()) } } else { ph := helper.New([]string{"CONTAINER NAME"}) @@ -83,7 +83,7 @@ func CobraRunE(vars *variables) func(cmd *cobra.Command, args []string) (err err ph.Append([]string{cont}) } ph.Render() - wwlog.Info(ph.String()) + wwlog.Info("%s", ph.String()) } return } diff --git a/internal/app/wwctl/node/list/main.go b/internal/app/wwctl/node/list/main.go index af0e5cd4..1bfe4ae8 100644 --- a/internal/app/wwctl/node/list/main.go +++ b/internal/app/wwctl/node/list/main.go @@ -45,7 +45,7 @@ func CobraRunE(vars *variables) func(cmd *cobra.Command, args []string) (err err ph.Append(strings.Split(val, ":=:")) } ph.Render() - wwlog.Info(ph.String()) + wwlog.Info("%s", ph.String()) } } return diff --git a/internal/app/wwctl/profile/list/main.go b/internal/app/wwctl/profile/list/main.go index d939d5e7..a8367027 100644 --- a/internal/app/wwctl/profile/list/main.go +++ b/internal/app/wwctl/profile/list/main.go @@ -37,7 +37,7 @@ func CobraRunE(vars *variables) func(cmd *cobra.Command, args []string) (err err ph.Append(strings.Split(val, ":=:")) } ph.Render() - wwlog.Info(ph.String()) + wwlog.Info("%s", ph.String()) } } return