Ent only ADP Metrics #21681
Merged
Ent only ADP Metrics #21681
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
the
hashicorp-contributed-pr
mpalmi
reviewed
Jul 7, 2023
mpalmi
requested changes
Jul 7, 2023
vault/core.go
Outdated
| @@ -3234,28 +3235,7 @@ func (c *Core) isMountable(ctx context.Context, entry *MountEntry, pluginType co | |||
| // isMountEntryBuiltin determines whether a mount entry is associated with a | |||
| // builtin of the specified plugin type. | |||
| func (c *Core) isMountEntryBuiltin(ctx context.Context, entry *MountEntry, pluginType consts.PluginType) bool { | |||
There was a problem hiding this comment.
If you're going to have separate implementations for OSS/ENT, you'd want to do this in core_util.go.
There was a problem hiding this comment.
not sure how this happened - but removed this impl because this wasn't a change in ent either.
mpalmi
reviewed
Jul 7, 2023
changelog/21681.txt
Outdated
| @@ -0,0 +1,3 @@ | |||
| ```release-note:improvement | |||
| sys/metrics: Adds a gauge metric that tracks whether enterprise builtin secret plugins are enabled. | |||
There was a problem hiding this comment.
Looks like we lost the (enterprise) decorator here.
mpalmi
reviewed
Jul 7, 2023
helper/builtinplugins/registry.go
Outdated
| @@ -283,6 +283,11 @@ func (r *registry) DeprecationStatus(name string, pluginType consts.PluginType) | |||
| return consts.Unknown, false | |||
| } | |||
|
|
|||
| // IsBuiltinEntPlugin checks whether the plugin is an enterprise only builtin plugin | |||
| func (r *registry) IsBuiltinEntPlugin(name string, pluginType consts.PluginType) bool { | |||
There was a problem hiding this comment.
I think you're going to have to handle both OSS and ENT here. This file is in both OSS and ENT.
mpalmi
reviewed
Jul 7, 2023
| @@ -26,6 +26,8 @@ import ( | |||
| "github.com/mitchellh/go-testing-interface" | |||
| ) | |||
|
|
|||
| var externalPlugins = []string{""} | |||
There was a problem hiding this comment.
This is also agnostic of OSS/ENT, so we'll have to change move this elsewhere.
This was referenced Jul 10, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
OSS PR for https://github.com/hashicorp/vault-enterprise/pull/4235