From 728e77a7261dc3fcda1e61e79be066c789bbba0c Mon Sep 17 00:00:00 2001 From: Teppei Fukuda Date: Mon, 3 Jun 2024 09:31:18 +0400 Subject: [PATCH] fix(plugin): initialize logger (#6836) Signed-off-by: knqyf263 --- cmd/trivy/main.go | 3 ++- pkg/commands/app.go | 2 +- pkg/plugin/manager.go | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cmd/trivy/main.go b/cmd/trivy/main.go index 9e4fe4f5d639..6cbda13b9cf3 100644 --- a/cmd/trivy/main.go +++ b/cmd/trivy/main.go @@ -28,7 +28,8 @@ func main() { func run() error { // Trivy behaves as the specified plugin. if runAsPlugin := os.Getenv("TRIVY_RUN_AS_PLUGIN"); runAsPlugin != "" { - if err := plugin.RunWithURL(context.Background(), runAsPlugin, plugin.Options{Args: os.Args[1:]}); err != nil { + log.InitLogger(false, false) + if err := plugin.Run(context.Background(), runAsPlugin, plugin.Options{Args: os.Args[1:]}); err != nil { return xerrors.Errorf("plugin error: %w", err) } return nil diff --git a/pkg/commands/app.go b/pkg/commands/app.go index cac211fa1484..4a8331a71053 100644 --- a/pkg/commands/app.go +++ b/pkg/commands/app.go @@ -799,7 +799,7 @@ func NewPluginCommand() *cobra.Command { Short: "Run a plugin on the fly", Args: cobra.MinimumNArgs(1), RunE: func(cmd *cobra.Command, args []string) error { - return plugin.RunWithURL(cmd.Context(), args[0], plugin.Options{Args: args[1:]}) + return plugin.Run(cmd.Context(), args[0], plugin.Options{Args: args[1:]}) }, }, &cobra.Command{ diff --git a/pkg/plugin/manager.go b/pkg/plugin/manager.go index 741d245d6b62..91dd30d368c3 100644 --- a/pkg/plugin/manager.go +++ b/pkg/plugin/manager.go @@ -84,8 +84,8 @@ func Install(ctx context.Context, name string, opts Options) (Plugin, error) { func Start(ctx context.Context, name string, opts Options) (Wait, error) { return defaultManager().Start(ctx, name, opts) } -func RunWithURL(ctx context.Context, name string, opts Options) error { - return defaultManager().RunWithURL(ctx, name, opts) +func Run(ctx context.Context, name string, opts Options) error { + return defaultManager().Run(ctx, name, opts) } func Upgrade(ctx context.Context, names []string) error { return defaultManager().Upgrade(ctx, names) } func Uninstall(ctx context.Context, name string) error { return defaultManager().Uninstall(ctx, name) } @@ -291,8 +291,8 @@ func (m *Manager) Start(ctx context.Context, name string, opts Options) (Wait, e return wait, nil } -// RunWithURL runs the plugin -func (m *Manager) RunWithURL(ctx context.Context, name string, opts Options) error { +// Run installs and runs the plugin +func (m *Manager) Run(ctx context.Context, name string, opts Options) error { plugin, err := m.Install(ctx, name, opts) if err != nil { return xerrors.Errorf("plugin install error: %w", err)