Allow disabling brearer token override from request in metrics store #4726
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: Pavol Loffay <[email protected]>
yurishkuro
reviewed
Sep 5, 2023
| @@ -88,6 +89,8 @@ func (opt *Options) AddFlags(flagSet *flag.FlagSet) { | |||
| "The period to wait for a connection to Prometheus when executing queries.") | |||
| flagSet.String(nsConfig.namespace+suffixTokenFilePath, defaultTokenFilePath, | |||
| "The path to a file containing the bearer token which will be included when executing queries against the Prometheus API.") | |||
| flagSet.Bool(nsConfig.namespace+suffixOverrideFromContext, true, | |||
| "Whether the bearer token should be overridden from context (incoming request)") | |||
There was a problem hiding this comment.
the phrasing is a bit confusing to me. In terms of functionality, it seems a priority list would be a more elegant solution that covers more use cases, e.g., e.g. --token-priority=context,file or --token-priority=file (the latter will achieve what this PR needs I think)
There was a problem hiding this comment.
The priority is not supported by our bearertoken package
jaeger/pkg/bearertoken/transport.go
Line 42 in 4aa436b
I don't need the priority. I want to for the transport to always use the token regardless of what is in the context.
Signed-off-by: Pavol Loffay <[email protected]>
|
booked #4732 for flaky test |
Codecov ReportPatch coverage is
📢 Thoughts on this report? Let us know!. |
yurishkuro
approved these changes
Sep 6, 2023
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.
Relates to grafana/tempo-operator#526