Skip to content

fix: use custom HTTP client for silences too #416

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

Open
simonpasquier wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: use custom HTTP client for silences too #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions injectproxy/routes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,11 @@ const (
)

type routes struct {
upstream *url.URL
handler http.Handler
label string
el ExtractLabeler
upstream *url.URL
handler http.Handler
httpClient *http.Client
label string
el ExtractLabeler

mux http.Handler
modifiers map[string]func(*http.Response) error
Expand Down Expand Up @@ -529,6 +530,8 @@ func NewRoutes(upstream *url.URL, label string, extractLabeler ExtractLabeler, o
transport.TLSClientConfig.Certificates = []tls.Certificate{cert}
}

r.httpClient = &http.Client{Transport: transport}

proxy.Transport = transport
proxy.ModifyResponse = r.ModifyResponse
proxy.ErrorHandler = r.errorHandler
Expand Down
2 changes: 1 addition & 1 deletion injectproxy/silences.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ func (r *routes) deleteSilence(w http.ResponseWriter, req *http.Request) {

func (r *routes) getSilenceByID(ctx context.Context, id string) (*models.GettableSilence, error) {
amc := client.New(
runtimeclient.New(r.upstream.Host, path.Join(r.upstream.Path, "/api/v2"), []string{r.upstream.Scheme}),
runtimeclient.NewWithClient(r.upstream.Host, path.Join(r.upstream.Path, "/api/v2"), []string{r.upstream.Scheme}, r.httpClient),
strfmt.Default,
)
params := silence.NewGetSilenceParams().WithContext(ctx)
Expand Down
Loading