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

Explicitly pass http config to doppler consumer #28277

Merged
merged 2 commits into from
Oct 7, 2021
Merged

Explicitly pass http config to doppler consumer #28277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cb856d
Explicitly pass http config to doppler consumer
jsoriano Oct 6, 2021
5ddefdc
Fix changelog
jsoriano Oct 6, 2021
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
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Remove deprecated fields in Kafka module. {pull}27938[27938]
- Remove deprecated fields in coredns module. {pull}28196[28196]
- Remove old `httpjson` config implementation. {pull}28054[28054]
- Fix initialization of http client in Cloudfoundry input. {issue}28271[28271] {pull}28277[28277]

*Heartbeat*

Expand Down
12 changes: 4 additions & 8 deletions x-pack/libbeat/common/cloudfoundry/dopplerconsumer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
package cloudfoundry

import (
"fmt"
"crypto/tls"
"net/http"
"net/url"
"regexp"
"sync"

Expand Down Expand Up @@ -37,13 +38,8 @@ type DopplerConsumer struct {
started bool
}

func newDopplerConsumer(address string, id string, log *logp.Logger, client *http.Client, tr *TokenRefresher, callbacks DopplerCallbacks) (*DopplerConsumer, error) {
transport, ok := client.Transport.(*http.Transport)
if !ok {
return nil, fmt.Errorf("expected http transport on client")
}

c := consumer.New(address, transport.TLSClientConfig, transport.Proxy)
func newDopplerConsumer(address string, id string, log *logp.Logger, tlsConfig *tls.Config, proxy func(*http.Request) (*url.URL, error), tr *TokenRefresher, callbacks DopplerCallbacks) (*DopplerConsumer, error) {
c := consumer.New(address, tlsConfig, proxy)
c.RefreshTokenFrom(tr)
c.SetDebugPrinter(newLogpDebugPrinter(log))

Expand Down
7 changes: 4 additions & 3 deletions x-pack/libbeat/common/cloudfoundry/hub.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,13 +129,14 @@ func (h *Hub) DopplerConsumerFromClient(client *cfclient.Client, callbacks Doppl
if dopplerAddress == "" {
dopplerAddress = client.Endpoint.DopplerEndpoint
}
httpClient, _, err := h.httpClient()
tlsConfig, err := tlscommon.LoadTLSConfig(h.cfg.Transport.TLS)
if err != nil {
return nil, errors.Wrap(err, "getting http client")
return nil, errors.Wrap(err, "loading tls config")
}
proxy := h.cfg.Transport.Proxy.ProxyFunc()

tr := TokenRefresherFromCfClient(client)
return newDopplerConsumer(dopplerAddress, h.cfg.ShardID, h.log, httpClient, tr, callbacks)
return newDopplerConsumer(dopplerAddress, h.cfg.ShardID, h.log, tlsConfig.ToConfig(), proxy, tr, callbacks)
}

// doerFromClient returns an auth token doer using uaa.
Expand Down