diff options
author | KallyDev <36319157+kallydev@users.noreply.github.com> | 2021-09-30 01:17:48 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-29 11:17:48 -0600 |
commit | c48fadc4a7655008d13076c7f757c36368e2ca13 (patch) | |
tree | 3fe2837e02e9b664dd5b86afbe42494ac20997f8 /caddyconfig/httploader.go | |
parent | 059fc32f002d00e980b438b3edbdf7b8bcdf9a90 (diff) |
Move from deprecated ioutil to os and io packages (#4364)
Diffstat (limited to 'caddyconfig/httploader.go')
-rw-r--r-- | caddyconfig/httploader.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/caddyconfig/httploader.go b/caddyconfig/httploader.go index d9e222b..396e153 100644 --- a/caddyconfig/httploader.go +++ b/caddyconfig/httploader.go @@ -18,8 +18,9 @@ import ( "crypto/tls" "crypto/x509" "fmt" - "io/ioutil" + "io" "net/http" + "os" "time" "github.com/caddyserver/caddy/v2" @@ -95,7 +96,7 @@ func (hl HTTPLoader) LoadConfig(ctx caddy.Context) ([]byte, error) { return nil, fmt.Errorf("server responded with HTTP %d", resp.StatusCode) } - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) if err != nil { return nil, err } @@ -144,7 +145,7 @@ func (hl HTTPLoader) makeClient(ctx caddy.Context) (*http.Client, error) { if len(hl.TLS.RootCAPEMFiles) > 0 { rootPool := x509.NewCertPool() for _, pemFile := range hl.TLS.RootCAPEMFiles { - pemData, err := ioutil.ReadFile(pemFile) + pemData, err := os.ReadFile(pemFile) if err != nil { return nil, fmt.Errorf("failed reading ca cert: %v", err) } |