fix: fix --header flag in CLI #8023
Merged
Conversation
This file contains hidden or 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
mafredri
approved these changes
Jun 14, 2023
| @@ -430,6 +427,15 @@ type RootCmd struct { | |||
| } | |||
|
|
|||
| func addTelemetryHeader(client *codersdk.Client, inv *clibase.Invocation) { | |||
| transport, ok := client.HTTPClient.Transport.(*headerTransport) | |||
| if !ok { | |||
| transport = &headerTransport{ | |||
There was a problem hiding this comment.
I'm a bit worried about losing headers in a situation where we think it's safe to wrap the transport and we end up with a type that's headerTransport(otherTransport(headerTransport)). Not sure what the best approach to guard against this would be, though.
There was a problem hiding this comment.
Yeah I'm unsure either but I don't think it will happen in practice, the addTelemetryHeader fn is called immediately after creating the client
kylecarbs
approved these changes
Jun 14, 2023
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
The
--headerflag was changed fromkey=valuetokey:valuein 43eee35 which is a breaking change.This PR reverts the behavior to
key=valueas there doesn't seem to be a good reason for the breaking change.The
ExtraHeadersfield is removed fromcodersdk.Clientto match the prior behavior and to reduce the amount of ways headers can be set in the SDK to avoid confusion.This regression would've been caught by an existing test, but the test was faulty and didn't catch the issue. The test has been fixed and improved, and a test has been added to make sure headers are sent to the DERP server to avoid breaking #6572.
Fixes #8021
Fixes https://github.com/coder/v2-customers/issues/203