This repository has been archived by the owner on Nov 8, 2022. It is now read-only.
Fixes #525 swap plugins of diff types #623
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
| @@ -395,16 +395,41 @@ func (p *pluginControl) SwapPlugins(in *core.RequestedPlugin, out core.Cataloged | |||
| return err | |||
| } | |||
|
|
|||
| // Make sure plugin types and names are the same | |||
| if lp.TypeName() != out.TypeName() || lp.Name() != out.Name() { | |||
| fmt.Println(lp.TypeName()) | |||
There was a problem hiding this comment.
Want to pull out these Printlns?
tiffanyfay
force-pushed
the
tb/refactor
branch
from
2ff7242 to
339c085
Compare
| serr := serror.New(errors.New("Plugin types and names must match.")) | ||
| serr.SetFields(map[string]interface{}{ | ||
| "in Type": lp.TypeName(), | ||
| "out Type": out.TypeName(), |
There was a problem hiding this comment.
I think by convention these keys shouldn't contain spaces.
Technically it's valid, but I'd prefer something like in_type.
There was a problem hiding this comment.
Did in-type to match the format of the ones already there.
tiffanyfay
force-pushed
the
tb/refactor
branch
from
339c085 to
be4bf6a
Compare
|
🚢 it. Nicely done. |
|
Thanks. |
tiffanyfay
added a commit
that referenced
this pull request
Dec 10, 2015
Fixes #525 swap plugins of diff types
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
#525
Based on feedback from @danielscottt, mock 1 and mock 2 plugin names should just be mock since they're different versions of mock plugins. Made this change.
Also swap now verifies that the plugins are the same type and name.