diff options
| author | Ash McKenzie <amckenzie@gitlab.com> | 2022-04-27 03:50:56 +0000 |
|---|---|---|
| committer | Ash McKenzie <amckenzie@gitlab.com> | 2022-04-27 03:50:56 +0000 |
| commit | 792f4bdf9abf140ab34692959dae7cd5a0dfd462 (patch) | |
| tree | 239989c951e5369670977faf5067c547d9438fe2 /client | |
| parent | 73a8361eb3c49979d4ff5d9f1ba82a9935b22915 (diff) | |
| parent | 655ef6898ce883e71cae29c688b04830130897ec (diff) | |
| download | gitlab-shell-792f4bdf9abf140ab34692959dae7cd5a0dfd462.tar.gz | |
Merge branch '484_remove_outdated_func' into 'main'
Remove deprecated function NewHTTPClient
See merge request gitlab-org/gitlab-shell!603
Diffstat (limited to 'client')
| -rw-r--r-- | client/httpclient.go | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/client/httpclient.go b/client/httpclient.go index 0a5b149..bd00b6b 100644 --- a/client/httpclient.go +++ b/client/httpclient.go @@ -14,7 +14,6 @@ import ( "time" "gitlab.com/gitlab-org/labkit/correlation" - "gitlab.com/gitlab-org/labkit/log" "gitlab.com/gitlab-org/labkit/tracing" ) @@ -70,15 +69,6 @@ func validateCaFile(filename string) error { return nil } -// Deprecated: use NewHTTPClientWithOpts - https://gitlab.com/gitlab-org/gitlab-shell/-/issues/484 -func NewHTTPClient(gitlabURL, gitlabRelativeURLRoot, caFile, caPath string, readTimeoutSeconds uint64) *HttpClient { - c, err := NewHTTPClientWithOpts(gitlabURL, gitlabRelativeURLRoot, caFile, caPath, readTimeoutSeconds, nil) - if err != nil { - log.WithError(err).Error("new http client with opts") - } - return c -} - // NewHTTPClientWithOpts builds an HTTP client using the provided options func NewHTTPClientWithOpts(gitlabURL, gitlabRelativeURLRoot, caFile, caPath string, readTimeoutSeconds uint64, opts []HTTPClientOpt) (*HttpClient, error) { var transport *http.Transport |