diff --git a/changelog/17430.txt b/changelog/17430.txt new file mode 100644 index 000000000..12ab331a0 --- /dev/null +++ b/changelog/17430.txt @@ -0,0 +1,3 @@ +```release-note:improvement +plugins: Add plugin version information to key plugin lifecycle log lines. +``` \ No newline at end of file diff --git a/command/auth_enable.go b/command/auth_enable.go index 33ec9291b..bddf11cb5 100644 --- a/command/auth_enable.go +++ b/command/auth_enable.go @@ -321,6 +321,9 @@ func (c *AuthEnableCommand) Run(args []string) int { if authType == "plugin" { authThing = c.flagPluginName + " plugin" } + if c.flagPluginVersion != "" { + authThing += " version " + c.flagPluginVersion + } c.UI.Output(fmt.Sprintf("Success! Enabled %s at: %s", authThing, authPath)) return 0 } diff --git a/command/secrets_enable.go b/command/secrets_enable.go index 4b8d31378..8be62953d 100644 --- a/command/secrets_enable.go +++ b/command/secrets_enable.go @@ -343,6 +343,9 @@ func (c *SecretsEnableCommand) Run(args []string) int { if engineType == "plugin" { thing = c.flagPluginName + " plugin" } + if c.flagPluginVersion != "" { + thing += " version " + c.flagPluginVersion + } c.UI.Output(fmt.Sprintf("Success! Enabled the %s at: %s", thing, mountPath)) return 0 } diff --git a/vault/auth.go b/vault/auth.go index 0a4268bee..11b603d66 100644 --- a/vault/auth.go +++ b/vault/auth.go @@ -232,7 +232,7 @@ func (c *Core) enableCredentialInternal(ctx context.Context, entry *MountEntry, } if c.logger.IsInfo() { - c.logger.Info("enabled credential backend", "path", entry.Path, "type", entry.Type) + c.logger.Info("enabled credential backend", "path", entry.Path, "type", entry.Type, "version", entry.Version) } return nil } @@ -845,7 +845,7 @@ func (c *Core) setupCredentials(ctx context.Context) error { } if c.logger.IsInfo() { - c.logger.Info("successfully enabled credential backend", "type", entry.Type, "path", entry.Path, "namespace", entry.Namespace()) + c.logger.Info("successfully enabled credential backend", "type", entry.Type, "version", entry.Version, "path", entry.Path, "namespace", entry.Namespace()) } // Ensure the path is tainted if set in the mount table diff --git a/vault/mount.go b/vault/mount.go index c7003a293..b6813b0ad 100644 --- a/vault/mount.go +++ b/vault/mount.go @@ -679,7 +679,7 @@ func (c *Core) mountInternal(ctx context.Context, entry *MountEntry, updateStora } if c.logger.IsInfo() { - c.logger.Info("successful mount", "namespace", entry.Namespace().Path, "path", entry.Path, "type", entry.Type) + c.logger.Info("successful mount", "namespace", entry.Namespace().Path, "path", entry.Path, "type", entry.Type, "version", entry.Version) } return nil } @@ -1493,7 +1493,7 @@ func (c *Core) setupMounts(ctx context.Context) error { } if c.logger.IsInfo() { - c.logger.Info("successfully mounted backend", "type", entry.Type, "path", entry.Path) + c.logger.Info("successfully mounted backend", "type", entry.Type, "version", entry.Version, "path", entry.Path) } // Ensure the path is tainted if set in the mount table diff --git a/vault/plugin_reload.go b/vault/plugin_reload.go index 2d5544de0..deae7054f 100644 --- a/vault/plugin_reload.go +++ b/vault/plugin_reload.go @@ -62,7 +62,7 @@ func (c *Core) reloadMatchingPluginMounts(ctx context.Context, mounts []string) errors = multierror.Append(errors, fmt.Errorf("cannot reload plugin on %q: %w", mount, err)) continue } - c.logger.Info("successfully reloaded plugin", "plugin", entry.Accessor, "path", entry.Path) + c.logger.Info("successfully reloaded plugin", "plugin", entry.Accessor, "path", entry.Path, "version", entry.Version) } return errors } @@ -92,7 +92,7 @@ func (c *Core) reloadMatchingPlugin(ctx context.Context, pluginName string) erro if err != nil { return err } - c.logger.Info("successfully reloaded plugin", "plugin", pluginName, "path", entry.Path) + c.logger.Info("successfully reloaded plugin", "plugin", pluginName, "path", entry.Path, "version", entry.Version) } } @@ -108,7 +108,7 @@ func (c *Core) reloadMatchingPlugin(ctx context.Context, pluginName string) erro if err != nil { return err } - c.logger.Info("successfully reloaded plugin", "plugin", entry.Accessor, "path", entry.Path) + c.logger.Info("successfully reloaded plugin", "plugin", entry.Accessor, "path", entry.Path, "version", entry.Version) } }