From d87d4c3a9a37a9617c6f825b8d1555571f88d871 Mon Sep 17 00:00:00 2001 From: Kemal Hadimli Date: Mon, 21 Apr 2025 12:08:00 +0100 Subject: [PATCH] feat: Show plugin version in plugin server logs --- plugin/plugin.go | 4 ++++ serve/info.go | 4 +--- serve/plugin.go | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/plugin/plugin.go b/plugin/plugin.go index 2d0771d42f..9a482041ea 100644 --- a/plugin/plugin.go +++ b/plugin/plugin.go @@ -166,6 +166,10 @@ func (p *Plugin) Meta() Meta { } } +func (p *Plugin) PackageAndVersion() string { + return fmt.Sprintf("%s/%s/%s@%s", p.team, p.kind, p.name, p.version) +} + // SetSkipUsageClient sets whether the usage client should be skipped func (p *Plugin) SetSkipUsageClient(v bool) { p.skipUsageClient = v diff --git a/serve/info.go b/serve/info.go index a087f61e1c..53cc5e0d9f 100644 --- a/serve/info.go +++ b/serve/info.go @@ -1,8 +1,6 @@ package serve import ( - "fmt" - "github.com/spf13/cobra" ) @@ -18,7 +16,7 @@ func (s *PluginServe) newCmdPluginInfo() *cobra.Command { Long: pluginInfoLong, Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, _ []string) error { - cmd.Println(fmt.Sprintf("Package and version: %s/%s/%s@%s", s.plugin.Team(), s.plugin.Kind(), s.plugin.Name(), s.plugin.Version())) + cmd.Println("Package and version:", s.plugin.PackageAndVersion()) return nil }, } diff --git a/serve/plugin.go b/serve/plugin.go index 9f32995190..b38d44c8a5 100644 --- a/serve/plugin.go +++ b/serve/plugin.go @@ -222,7 +222,7 @@ func (s *PluginServe) newCmdPluginServe() *cobra.Command { } }() - logger.Info().Str("address", listener.Addr().String()).Msg("Plugin server listening") + logger.Info().Str("address", listener.Addr().String()).Str("plugin", s.plugin.PackageAndVersion()).Msg("Plugin server listening") if err := grpcServer.Serve(listener); err != nil { return fmt.Errorf("failed to serve: %w", err) }