libnetwork: handle id filter better #1497
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
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: Luap99 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 |
|
@edsantiago PTAL |
By default we should do a standard prefix match. See containers/podman#18471 for context. Also use the c/storage regex package to only compile the regex when needed. Signed-off-by: Paul Holzinger <[email protected]>
vrothberg
reviewed
Jun 12, 2023
| @@ -38,7 +38,7 @@ func createFilterFuncs(key string, filterValues []string) (types.FilterFunc, err | |||
| case "id": | |||
| // matches part of one id | |||
| return func(net types.Network) bool { | |||
| return util.StringMatchRegexSlice(net.ID, filterValues) | |||
| return util.FilterID(net.ID, filterValues) | |||
There was a problem hiding this comment.
pkg util calling another pkg util is confusing but I see why the function lives in the other util.
edsantiago
reviewed
Jun 12, 2023
| // input is hex we check if the prefix matches. Otherwise we assume it is a | ||
| // regex and try to match that. | ||
| // see https://github.com/containers/podman/issues/18471 for why we do this | ||
| func FilterID(id string, filters []string) bool { |
There was a problem hiding this comment.
Code LGTM but all other such functions make it clear that they operate on Slices. Would it make sense to rename FilterID similarly?
|
/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.
By default we should do a standard prefix match.
See containers/podman#18471 for context.
Also use the c/storage regex package to only compile the regex when needed.