From 920fd39ec1ae84cda9c2ff44e9446bbe372ecc81 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Wed, 9 Feb 2022 16:57:26 -0800 Subject: [PATCH] Update builtin command to use CommandParams --- builtin/myplugin/command/command.go | 10 +++++----- builtin/myplugin/command/dothing.go | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/builtin/myplugin/command/command.go b/builtin/myplugin/command/command.go index 3ec3fe3b9..307cefba2 100644 --- a/builtin/myplugin/command/command.go +++ b/builtin/myplugin/command/command.go @@ -63,11 +63,11 @@ func (c *Command) ExecuteInfo(trm terminal.UI, env plugincore.Project) int32 { return (&Info{Command: c}).Execute(trm, env) } -func (c *Command) ExecuteDoThing(trm terminal.UI, flags map[string]interface{}) int32 { - return (&DoThing{Command: c}).Execute(trm, flags) +func (c *Command) ExecuteDoThing(trm terminal.UI, params *component.CommandParams) int32 { + return (&DoThing{Command: c}).Execute(trm, params) } -func (c *Command) ExecuteInteractive(trm terminal.UI, flags map[string]interface{}) int32 { +func (c *Command) ExecuteInteractive(trm terminal.UI, params *component.CommandParams) int32 { return (&Interactive{Command: c}).Execute(trm) } @@ -110,8 +110,8 @@ func (c *Command) Flags() component.CommandFlags { } } -func (c *Command) Execute(trm terminal.UI, flags map[string]interface{}) int32 { - trm.Output("You gave me the flag: " + flags["hehe"].(string)) +func (c *Command) Execute(trm terminal.UI, params *component.CommandParams) int32 { + trm.Output("You gave me the flag: " + params.Flags["hehe"].(string)) trm.Output(c.Help()) trm.Output("My subcommands are: ") diff --git a/builtin/myplugin/command/dothing.go b/builtin/myplugin/command/dothing.go index 98dab646f..0496092ae 100644 --- a/builtin/myplugin/command/dothing.go +++ b/builtin/myplugin/command/dothing.go @@ -78,9 +78,9 @@ func (c *DoThing) Flags() component.CommandFlags { } } -func (c *DoThing) Execute(trm terminal.UI, flags map[string]interface{}) int32 { +func (c *DoThing) Execute(trm terminal.UI, params *component.CommandParams) int32 { trm.Output("Tricked ya! I actually do nothing :P") - trm.Output("You gave me the stringflag: " + flags["stringflag"].(string)) + trm.Output("You gave me the stringflag: " + params.Flags["stringflag"].(string)) return 0 }