From d9200ab5e9dffd78ea6252441a8d120253d5b5dc Mon Sep 17 00:00:00 2001 From: Ben Schumacher Date: Wed, 31 Jan 2024 13:48:00 +0100 Subject: [PATCH] Space out plugin list in mmctl (#25986) * Space out plugin list in mmctl * Fix test * Fix test part 2 --- server/cmd/mmctl/commands/plugin.go | 1 + server/cmd/mmctl/commands/plugin_test.go | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/server/cmd/mmctl/commands/plugin.go b/server/cmd/mmctl/commands/plugin.go index 1e1b76e768..1fcb06563d 100644 --- a/server/cmd/mmctl/commands/plugin.go +++ b/server/cmd/mmctl/commands/plugin.go @@ -187,6 +187,7 @@ func pluginListCmdF(c client.Client, cmd *cobra.Command, args []string) error { printer.PrintT("{{.Manifest.Id}}: {{.Manifest.Name}}, Version: {{.Manifest.Version}}", plugin) } + printer.Print("") printer.Print("Listing disabled plugins") for _, plugin := range pluginsResp.Inactive { printer.PrintT("{{.Manifest.Id}}: {{.Manifest.Name}}, Version: {{.Manifest.Version}}", plugin) diff --git a/server/cmd/mmctl/commands/plugin_test.go b/server/cmd/mmctl/commands/plugin_test.go index 88de0c57c5..37df9b377a 100644 --- a/server/cmd/mmctl/commands/plugin_test.go +++ b/server/cmd/mmctl/commands/plugin_test.go @@ -431,16 +431,17 @@ func (s *MmctlUnitTestSuite) TestPluginListCmd() { err := pluginListCmdF(s.client, &cobra.Command{}, nil) s.Require().NoError(err) s.Require().Len(printer.GetErrorLines(), 0) - s.Require().Len(printer.GetLines(), 8) + s.Require().Len(printer.GetLines(), 9) s.Require().Equal("Listing enabled plugins", printer.GetLines()[0]) for i, plugin := range mockList.Active { s.Require().Equal(plugin, printer.GetLines()[i+1]) } - s.Require().Equal("Listing disabled plugins", printer.GetLines()[4]) + s.Require().Equal("", printer.GetLines()[4]) + s.Require().Equal("Listing disabled plugins", printer.GetLines()[5]) for i, plugin := range mockList.Inactive { - s.Require().Equal(plugin, printer.GetLines()[i+5]) + s.Require().Equal(plugin, printer.GetLines()[i+6]) } }) @@ -506,16 +507,17 @@ func (s *MmctlUnitTestSuite) TestPluginListCmd() { err := pluginListCmdF(s.client, &cobra.Command{}, nil) s.Require().NoError(err) s.Require().Len(printer.GetErrorLines(), 0) - s.Require().Len(printer.GetLines(), 8) + s.Require().Len(printer.GetLines(), 9) s.Require().Equal("Listing enabled plugins", printer.GetLines()[0]) for i, plugin := range mockList.Active { s.Require().Equal(plugin.Id+": "+plugin.Name+", Version: "+plugin.Version, printer.GetLines()[i+1]) } - s.Require().Equal("Listing disabled plugins", printer.GetLines()[4]) + s.Require().Equal("", printer.GetLines()[4]) + s.Require().Equal("Listing disabled plugins", printer.GetLines()[5]) for i, plugin := range mockList.Inactive { - s.Require().Equal(plugin.Id+": "+plugin.Name+", Version: "+plugin.Version, printer.GetLines()[i+5]) + s.Require().Equal(plugin.Id+": "+plugin.Name+", Version: "+plugin.Version, printer.GetLines()[i+6]) } })