mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-06 04:09:40 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove deprecated use of ioutil (#5205)

Browse Source 
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
Jörn Friedrich Dreyer
2022-12-08 14:44:53 +01:00
committed by GitHub
parent 46cb910637
commit 53d15d329e
24 changed files with 57 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/proxy/pkg/middleware/authentication.go
View File

@@ -3,7 +3,6 @@ package middleware
import (
"fmt"
"io"
"io/ioutil"
"net/http"
"regexp"
"strings"
@@ -113,7 +112,7 @@ func Authentication(auths []Authenticator, opts ...Option) func(next http.Handle
// https://github.com/golang/go/issues/15527
defer r.Body.Close()
_, _ = io.Copy(ioutil.Discard, r.Body)
_, _ = io.Copy(io.Discard, r.Body)
}
})
}

4
services/proxy/pkg/middleware/oidc_auth.go
View File

@@ -3,7 +3,7 @@ package middleware
import (
"context"
"encoding/json"
"io/ioutil"
"io"
"net/http"
"strings"
"sync"
@@ -181,7 +181,7 @@ func (m *OIDCAuthenticator) getKeyfunc() *keyfunc.JWKS {
}
defer resp.Body.Close()
body, err := ioutil.ReadAll(resp.Body)
body, err := io.ReadAll(resp.Body)
if err != nil {
m.Logger.Error().Err(err).Msg("unable to read discovery response body")
return nil

4
services/proxy/pkg/proxy/proxy.go
View File

@@ -5,10 +5,10 @@ import (
"crypto/x509"
"errors"
"fmt"
"io/ioutil"
"net"
"net/http"
"net/http/httputil"
"os"
"time"
chimiddleware "github.com/go-chi/chi/v5/middleware"
@@ -56,7 +56,7 @@ func NewMultiHostReverseProxy(opts ...Option) (*MultiHostReverseProxy, error) {
}
if options.Config.BackendHTTPSCACert != "" {
certs := x509.NewCertPool()
pemData, err := ioutil.ReadFile(options.Config.BackendHTTPSCACert)
pemData, err := os.ReadFile(options.Config.BackendHTTPSCACert)
if err != nil {
return nil, err
}

5
services/proxy/pkg/proxy/proxy_integration_test.go
View File

@@ -4,7 +4,6 @@ import (
"bytes"
"fmt"
"io"
"io/ioutil"
"net/http"
"net/http/httptest"
"net/url"
@@ -133,7 +132,7 @@ func TestProxyIntegration(t *testing.T) {
return &http.Response{
StatusCode: 200,
Body: ioutil.NopCloser(bytes.NewBufferString(`OK`)),
Body: io.NopCloser(bytes.NewBufferString(`OK`)),
Header: make(http.Header),
}
})
@@ -146,7 +145,7 @@ func TestProxyIntegration(t *testing.T) {
t.Errorf("Expected status 200 from proxy-response got %v", rsp.StatusCode)
}
resultBody, err := ioutil.ReadAll(rsp.Body)
resultBody, err := io.ReadAll(rsp.Body)
if err != nil {
t.Fatal("Error reading result body")
}