connector/gitlab: Fix regexp in Link parser #1090
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
|
Can you add a test? |
|
Added test |
ericchiang
reviewed
Sep 29, 2017
connector/gitlab/gitlab_test.go
Outdated
| ) | ||
|
|
||
| func TestNextURL(t *testing.T) { | ||
| linkHeader := "<https://gitlab.com/api/v4/groups?page=3&per_page=20>; rel=\"next\", " + |
There was a problem hiding this comment.
nit: we generally prefer table driven tests https://github.com/golang/go/wiki/TableDrivenTests
If you want to add that here that works, if not I'm fine with the test as is.
connector/gitlab/gitlab.go
Outdated
| } else { | ||
| break | ||
| func nextURL(url string, link string) string { | ||
| reNext := regexp.MustCompile("<([^>]+)>; rel=\"next\"") |
There was a problem hiding this comment.
nit: move these to global vars so we don't re-compile them every time the function is called
var (
reNext = regexp.MustCompile("...")
reLast = regexp.MustCompile("...")
)
func nextURL() {
// .. use reNext and reLast
}
connector/gitlab/gitlab.go
Outdated
|
|
||
| if len(reNext.FindStringSubmatch(link)) > 1 { | ||
| return reNext.FindStringSubmatch(link)[1] | ||
| } else { |
There was a problem hiding this comment.
go lint picked this up as fishy
/home/travis/gopath/src/github.com/coreos/dex/connector/gitlab/gitlab.go:296:9: if block ends with a return statement, so drop this else and outdent its block
Found 1 lint suggestions; failing.
lsjostro
force-pushed
the
fix-link-regexp
branch
from
a85ea97 to
2d4a932
Compare
|
squashed and fixed the above comments |
lsjostro
force-pushed
the
fix-link-regexp
branch
from
2d4a932 to
4605fdd
Compare
lsjostro
changed the title
|
Awesome! Thanks! Looking forward to a patch release soon then. |
|
@ericchiang when can we expect this merged? |
|
@lsjostro sorry was out of the office. |
mmrath
pushed a commit
to mmrath/dex
that referenced
this pull request
Sep 2, 2019
connector/gitlab: Fix regexp in Link parser
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.
Fix regression in Link parser.
.* is to ambiguous.