From cf090823a38f7bd243b2de60efe6d3505bcea030 Mon Sep 17 00:00:00 2001 From: MatthewHink Date: Thu, 27 Jan 2022 15:30:36 -0500 Subject: [PATCH] Fix container build --all. #215. We didn't need to add an arg check here because it's already there. --- .../app/wwctl/container/build/build_test.go | 20 +++++++++++++++++++ internal/app/wwctl/container/build/root.go | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 internal/app/wwctl/container/build/build_test.go diff --git a/internal/app/wwctl/container/build/build_test.go b/internal/app/wwctl/container/build/build_test.go new file mode 100644 index 00000000..8da2b3f1 --- /dev/null +++ b/internal/app/wwctl/container/build/build_test.go @@ -0,0 +1,20 @@ +package build + +import ( + "testing" +) + +// TestArgsContainerBuild is a regression test for 215. +func TestArgsContainerBuild(t *testing.T) { + command := GetCommand() + + err := command.Args(command, []string{}) + if err != nil { + t.Errorf("no arguments to container build should succeed.") + } + + err = command.Args(command, []string{"container1", "container2"}) + if err != nil { + t.Errorf("multiple arguments to container build should succeed.") + } +} diff --git a/internal/app/wwctl/container/build/root.go b/internal/app/wwctl/container/build/root.go index 93ff98cd..eb9541cf 100644 --- a/internal/app/wwctl/container/build/root.go +++ b/internal/app/wwctl/container/build/root.go @@ -12,7 +12,7 @@ var ( Short: "(Re)build a bootable VNFS image", Long: "This command will build a bootable VNFS image from imported CONTAINER image(s).", RunE: CobraRunE, - Args: cobra.MinimumNArgs(1), + Args: cobra.ArbitraryArgs, ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { if len(args) != 0 { return nil, cobra.ShellCompDirectiveNoFileComp