Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

move ToClientWithHost to ToClient #5737

Merged
merged 5 commits into from
Jul 26, 2022
Merged

move ToClientWithHost to ToClient #5737

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
83118ea
move ToClientWithHost to ToClient
fatsheep9146 Jul 23, 2022
4744bb9
fix bugs
fatsheep9146 Jul 24, 2022
e21a1a2
add change log
fatsheep9146 Jul 24, 2022
386de1f
Update CHANGELOG.md
fatsheep9146 Jul 26, 2022
2242f31
fix for comments
fatsheep9146 Jul 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix for comments 
Signed-off-by: Ziqi Zhao <[email protected]>
  • Loading branch information
@fatsheep9146
fatsheep9146 committed Jul 26, 2022
commit 2242f31545e6ea90ed61081eea1cb871b69c5e8c
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
### 💡 Enhancements 💡

- `ocb` now exits with an error if it fails to load the build configuration. (#5731)
- Deprecate `HTTPClientSettings.ToClientWithHost` (#5737)

### 🧰 Bug fixes 🧰

Expand Down
10 changes: 8 additions & 2 deletions config/confighttp/confighttp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,12 @@ func (hcs *HTTPClientSettings) ToClient(host component.Host, settings component.
}

if hcs.Auth != nil {
if host.GetExtensions() == nil {
ext := host.GetExtensions()
if ext == nil {
return nil, errors.New("extensions configuration not found")
}

httpCustomAuthRoundTripper, aerr := hcs.Auth.GetClientAuthenticator(host.GetExtensions())
httpCustomAuthRoundTripper, aerr := hcs.Auth.GetClientAuthenticator(ext)
if aerr != nil {
return nil, aerr
}
Expand All @@ -182,6 +183,11 @@ func (hcs *HTTPClientSettings) ToClient(host component.Host, settings component.
}, nil
}

// Deprecated: [v0.57.0] use ToClient.
func (hcs *HTTPClientSettings) ToClientWithHost(host component.Host, settings component.TelemetrySettings) (*http.Client, error) {
return hcs.ToClient(host, settings)
}

// Custom RoundTripper that adds headers.
type headerRoundTripper struct {
transport http.RoundTripper
Expand Down