Remove DataStore pluggability #1707
Merged
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
azdagron
requested review from
amartinezfayo,
APTy,
evan2645 and
mcpherrinm
as code owners
See spiffe#1650 for background. As part of the fix, extends the PluginInfo interface to include information about whether or not the plugin is built in (to facilitate the newly added check). Fixes spiffe#1650 Signed-off-by: Andrew Harding <andrew.harding@hpe.com>
azdagron
force-pushed
the
remove-datastore-pluggability
branch
from
e35f02e
to
4245f0c
Compare
mcpherrinm
previously approved these changes
Jul 7, 2020
There was a problem hiding this comment.
Woo-hoo!
We may point in https://github.com/spiffe/spire/blob/master/doc/plugin_server_datastore_sql.md that it is the only DataStore supported.
pkg/server/catalog/catalog.go
Outdated
| p.DataStore = datastore_telemetry.WithMetrics(p.DataStore, config.Metrics) | ||
| // The DataStore interface is no longer pluggable (see #1650). | ||
| if !p.DataStore.BuiltIn() { | ||
| return nil, fmt.Errorf("pluggability for the DataStore is deprecated; only the built-in SQL plugin is supported") |
There was a problem hiding this comment.
no format needed
Suggested change
| return nil, fmt.Errorf("pluggability for the DataStore is deprecated; only the built-in SQL plugin is supported") | |
| return nil, errors.New("pluggability for the DataStore is deprecated; only the built-in SQL plugin is supported") |
Signed-off-by: Andrew Harding <andrew.harding@hpe.com>
azdagron
force-pushed
the
remove-datastore-pluggability
branch
from
c3d23f7
to
1a8e13e
Compare
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.
See #1650 for background. As part of the fix, extends the PluginInfo interface to include information about whether or not the plugin is built in (to facilitate the newly added check).
Fixes #1650 .