-
Notifications
You must be signed in to change notification settings - Fork 4.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update mount table and CLI with plugin version for auth #16856
Conversation
644d9f3
to
e9d10a4
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, mostly just small suggestions, and I'm not sure if there might be a bug somewhere in deregistering versioned plugins
Co-authored-by: Tom Proctor <[email protected]>
f63c42a
to
f699be4
Compare
I'm hesitant to merge this without approval for the extra commits I've made. But feel free to modify or merge this in my absence (as I'll be out for the next week). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just one CLI comment and a couple of nits
command/plugin_deregister.go
Outdated
@@ -33,7 +34,7 @@ Usage: vault plugin deregister [options] TYPE NAME | |||
|
|||
Deregister the plugin named my-custom-plugin: | |||
|
|||
$ vault plugin deregister auth my-custom-plugin | |||
$ vault plugin deregister auth my-custom-plugin [version] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we use a flag instead of positional arg here for consistency?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 Saw you did that in a follow-up commit. I think I was trying to avoid the version
/ plugin_version
confusion, but it's not as relevant here as it is for mounts.
command/plugin_deregister.go
Outdated
// Canonicalize the version string. | ||
// Add the 'v' back in, since semantic version strips it out, and we want to be consistent with internal plugins. | ||
pluginVersion = "v" + semanticVersion.String() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think there should be any need to canonicalise here - the server should accept it with or without the v
This updates the CLI and API to support plugin versions, and specifically targets updating the auth plugin machinery to support versions.
I'm targeting #16688 for now to minimize conflicts, but I can re-target against
main
if #16688 gets merged.