fix: validate plugins : allow many versions of the same plugin #1535
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
k8s-ci-robot
added
the
cncf-cla: yes
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: camilamacedo86 The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
approved
camilamacedo86
force-pushed
the
fix-plugin-version
branch
from
dae83e5
to
c0816df
Compare
|
/assign @estroz |
|
/kind bug |
camilamacedo86
force-pushed
the
fix-plugin-version
branch
from
c0816df
to
8256166
Compare
estroz
suggested changes
May 30, 2020
pkg/cli/cli.go
Outdated
| @@ -351,12 +351,13 @@ func validatePlugins(plugins ...plugin.Base) error { | |||
| pluginName, projectVersion, err) | |||
| } | |||
| } | |||
| // Check for duplicate plugin names. Names outside of a version can | |||
| // Check if has duplicate plugins. Names outside of a version can | |||
There was a problem hiding this comment.
Suggested change
| // Check if has duplicate plugins. Names outside of a version can | |
| // Check for duplicate plugin keys. |
pkg/cli/cli.go
Outdated
| @@ -351,12 +351,13 @@ func validatePlugins(plugins ...plugin.Base) error { | |||
| pluginName, projectVersion, err) | |||
| } | |||
| } | |||
| // Check for duplicate plugin names. Names outside of a version can | |||
| // Check if has duplicate plugins. Names outside of a version can | |||
| // conflict because multiple project versions of a plugin may exist. | |||
There was a problem hiding this comment.
Suggested change
| // conflict because multiple project versions of a plugin may exist. |
pkg/cli/cli.go
Outdated
| // conflict because multiple project versions of a plugin may exist. | ||
| if _, seen := pluginNameSet[pluginName]; seen { | ||
| return fmt.Errorf("two plugins have the same name: %q", pluginName) | ||
| pluginNameVersion := fmt.Sprintf("%v/%v", p.Name(), p.Version()) |
There was a problem hiding this comment.
Suggested change
| pluginNameVersion := fmt.Sprintf("%v/%v", p.Name(), p.Version()) | |
| pluginKey := plugin.KeyFor(p) |
pkg/cli/cli.go
Outdated
| if _, seen := pluginNameSet[pluginName]; seen { | ||
| return fmt.Errorf("two plugins have the same name: %q", pluginName) | ||
| pluginNameVersion := fmt.Sprintf("%v/%v", p.Name(), p.Version()) | ||
| if _, seen := pluginNameSet[pluginNameVersion]; seen { |
There was a problem hiding this comment.
Suggested change
| if _, seen := pluginNameSet[pluginNameVersion]; seen { | |
| if _, seen := pluginNameSet[pluginKey]; seen { |
pkg/cli/cli.go
Outdated
| } | ||
| pluginNameSet[pluginName] = struct{}{} | ||
| pluginNameSet[pluginNameVersion] = struct{}{} |
There was a problem hiding this comment.
Suggested change
| pluginNameSet[pluginNameVersion] = struct{}{} | |
| pluginNameSet[pluginKey] = struct{}{} |
pkg/cli/cli.go
Outdated
| return fmt.Errorf("two plugins have the same name: %q", pluginName) | ||
| pluginNameVersion := fmt.Sprintf("%v/%v", p.Name(), p.Version()) | ||
| if _, seen := pluginNameSet[pluginNameVersion]; seen { | ||
| return fmt.Errorf("two plugins have the same name and version: %q", pluginNameVersion) |
There was a problem hiding this comment.
Suggested change
| return fmt.Errorf("two plugins have the same name and version: %q", pluginNameVersion) | |
| return fmt.Errorf("two plugins have the same key: %q", pluginKey) |
camilamacedo86
force-pushed
the
fix-plugin-version
branch
from
8256166
to
4d8e7bb
Compare
estroz
reviewed
May 30, 2020
pkg/cli/cli_test.go
Outdated
| "foo.example.com/v3.0.0", | ||
| ) | ||
|
|
||
| err := validatePlugins(plugins[0], plugins[1], plugins[2]) |
There was a problem hiding this comment.
Suggested change
| err := validatePlugins(plugins[0], plugins[1], plugins[2]) | |
| err := validatePlugins(plugins...) |
estroz
reviewed
May 30, 2020
pkg/cli/cli_test.go
Outdated
| "foo.example.com/v1.0.0", | ||
| ) | ||
|
|
||
| err := validatePlugins(plugins[0], plugins[1]) |
There was a problem hiding this comment.
Suggested change
| err := validatePlugins(plugins[0], plugins[1]) | |
| err := validatePlugins(plugins...) |
camilamacedo86
force-pushed
the
fix-plugin-version
branch
from
4d8e7bb
to
3d4ae11
Compare
k8s-ci-robot
added
the
lgtm
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.
closes: #1534