Bump prometheus-auth to a more recent version of Go and stop using vendored modules and rancher/trash #12
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
aiyengar2
force-pushed
the
bump_prometheus_auth
branch
from
ee5bf72
to
d3d8c59
Compare
aiyengar2
force-pushed
the
bump_prometheus_auth
branch
from
d3d8c59
to
7d1c9dd
Compare
added 7 commits
December 12, 2022 15:16
…ogs on bad requests
…eturned by new parser library
In previous versions of the prometheus client, promlb.Matcher was just a struct that contained strings. However, in recent versions of the client, promlb.Matcher contains a FastRegexMatcher instantiated within it, which is only instantiated when you call promlb.NewMatcher on a matcher whose type is a regex match. As a result, simply modifying the promlb.Matcher struct fields results in a segfault on trying to parse a regex label selector using a new client, which is fixed with the change introduced here.
aiyengar2
force-pushed
the
bump_prometheus_auth
branch
from
7d1c9dd
to
bdfad55
Compare
aiyengar2
commented
Dec 12, 2022
| @@ -59,11 +60,7 @@ func Test_accessControl(t *testing.T) { | |||
| dbDir, err := ioutil.TempDir("", "tsdb-ready") | |||
| defer os.RemoveAll(dbDir) | |||
|
|
|||
| testutil.Ok(t, err) | |||
There was a problem hiding this comment.
fyi testutil no longer exists, that's why we're shifting to testify
aiyengar2
commented
Dec 12, 2022
Comment on lines
+437
to
+447
| type dbAdapter struct { | ||
| *promtsdb.DB | ||
| } | ||
|
|
||
| func (a *dbAdapter) Stats(statsByLabelName string) (*promtsdb.Stats, error) { | ||
| return a.Head().Stats(statsByLabelName), nil | ||
| } | ||
|
|
||
| func (a *dbAdapter) WALReplayStatus() (promtsdb.WALReplayStatus, error) { | ||
| return promtsdb.WALReplayStatus{}, nil | ||
| } |
There was a problem hiding this comment.
copied from upstream
aiyengar2
commented
Dec 12, 2022
Comment on lines
-361
to
-369
| resp, err = http.Post("http://localhost:9090/api/v2/admin/tsdb/snapshot", "", strings.NewReader("")) | ||
|
|
||
| testutil.Ok(t, err) | ||
| testutil.Equals(t, http.StatusOK, resp.StatusCode) | ||
|
|
||
| resp, err = http.Post("http://localhost:9090/api/v2/admin/tsdb/delete_series", "", strings.NewReader("{}")) | ||
|
|
||
| testutil.Ok(t, err) | ||
| testutil.Equals(t, http.StatusOK, resp.StatusCode) |
There was a problem hiding this comment.
not checked in upstream either anymore, so removed from our tests
aiyengar2
force-pushed
the
bump_prometheus_auth
branch
2 times, most recently
from
63d9e1b
to
e045a82
Compare
2 tasks
aiyengar2
force-pushed
the
bump_prometheus_auth
branch
from
e045a82
to
40b9585
Compare
aiyengar2
force-pushed
the
bump_prometheus_auth
branch
from
40b9585
to
92d01b8
Compare
aiyengar2
force-pushed
the
bump_prometheus_auth
branch
from
92d01b8
to
3e7f6bf
Compare
aiyengar2
force-pushed
the
bump_prometheus_auth
branch
from
3e7f6bf
to
67b000f
Compare
aiyengar2
force-pushed
the
bump_prometheus_auth
branch
from
b2c5707
to
f0833d6
Compare
aiyengar2
force-pushed
the
bump_prometheus_auth
branch
from
f0833d6
to
42870a8
Compare
geethub97
approved these changes
Dec 13, 2022
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.
Related Issue: rancher/rancher#39533