Merge pull request #2045 from Adirio/completion-option

⚠️ Explicitly define WithCompletion as an Option

cmd/main.go

@@ -37,7 +37,7 @@ func main() {
 		),
 		cli.WithDefaultPlugins(cfgv2.Version, &pluginv2.Plugin{}),
 		cli.WithDefaultPlugins(cfgv3.Version, &pluginv3.Plugin{}),
-		cli.WithCompletion,
+		cli.WithCompletion(),
 	)
 	if err != nil {
 		log.Fatal(err)

pkg/cli/cli_test.go

@@ -680,7 +680,7 @@ var _ = Describe("CLI", func() {
 
 		When("enabling completion", func() {
 			It("should create a valid CLI", func() {
-				c, err = New(WithCompletion)
+				c, err = New(WithCompletion())
 				Expect(err).NotTo(HaveOccurred())
 				Expect(hasSubCommand(c, "completion")).To(BeTrue())
 			})

pkg/cli/options.go

@@ -105,7 +105,9 @@ func WithExtraCommands(cmds ...*cobra.Command) Option {
 }
 
 // WithCompletion is an Option that adds the completion subcommand.
-func WithCompletion(c *cli) error {
-	c.completionCommand = true
-	return nil
+func WithCompletion() Option {
+	return func(c *cli) error {
+		c.completionCommand = true
+		return nil
+	}
 }

pkg/cli/options_test.go

@@ -230,7 +230,7 @@ var _ = Describe("CLI options", func() {
 		})
 
 		It("should add the completion command if requested", func() {
-			c, err = newCLI(WithCompletion)
+			c, err = newCLI(WithCompletion())
 			Expect(err).NotTo(HaveOccurred())
 			Expect(c).NotTo(BeNil())
 			Expect(c.completionCommand).To(BeTrue())