interfaces: validate plug/slot uniqueness #3153
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
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
|
This can only land after we land #3154 |
|
This branch depends on #3154 |
chipaca
approved these changes
Apr 10, 2017
niemeyer
approved these changes
Apr 10, 2017
interfaces/repo.go
Outdated
| if _, ok := r.plugs[plug.Snap.Name()][plug.Name]; ok { | ||
| return fmt.Errorf("cannot add plug, snap %q already has plug %q", plug.Snap.Name(), plug.Name) | ||
| if _, ok := r.plugs[snapName][plug.Name]; ok { | ||
| return fmt.Errorf("cannot add plug %q, snap %q already has a plug with that name", plug.Name, snapName) |
There was a problem hiding this comment.
From the user perspective, there's no plug or slot being added. I suggest reporting this as:
"snap %q has plugs conflicting on name %q"
"snap %q has plug and slot conflicting on name %q"
and so on.
There was a problem hiding this comment.
Aha, good point, this is just internal thing. I'll update this.
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
niemeyer
requested changes
Apr 10, 2017
interfaces/repo.go
Outdated
| if _, ok := r.plugs[plug.Snap.Name()][plug.Name]; ok { | ||
| return fmt.Errorf("cannot add plug, snap %q already has plug %q", plug.Snap.Name(), plug.Name) | ||
| if _, ok := r.plugs[snapName][plug.Name]; ok { | ||
| return fmt.Errorf("snap %q has plug and slot conflicting on name %q", snapName, plug.Name) |
There was a problem hiding this comment.
In this case it's plug and plug. Per the original comment here:
"snap %q has plugs conflicting on name %q"
There was a problem hiding this comment.
Ah, sorry, missed this detail. Same below. Correcting now.
interfaces/repo.go
Outdated
| if _, ok := r.slots[slot.Snap.Name()][slot.Name]; ok { | ||
| return fmt.Errorf("cannot add slot, snap %q already has slot %q", slot.Snap.Name(), slot.Name) | ||
| if _, ok := r.slots[snapName][slot.Name]; ok { | ||
| return fmt.Errorf("snap %q has plug and slot conflicting on name %q", snapName, slot.Name) |
There was a problem hiding this comment.
Similarly:
"snap %q has slots conflicting on name %q"
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
niemeyer
approved these changes
Apr 10, 2017
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
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.
This branch improves validation of changes made to the interfaces repository. In the past this was done
at
snap.Infolevel, specifically viasnap.Validatebut this was ignoring additional changes caused byadding implicit plug or slot names. This has caused a bug where the
coresnap would define some plugsdirectly in the YAML file (specifically
network-bindplug) and and than would gain implicitnetwork-bindslot through the implicit mechanism. Now direct additions of plugs and slots are also enforcing the uniqueness constraint.NOTE: This branch might only be clean to land after the new core snap is released.