replace ioutil with new functions (#473)

Signed-off-by: Sandor Szücs <[email protected]>

aws/iam_test.go

@@ -1,7 +1,7 @@
 package aws
 
 import (
- "io/ioutil"
+ "os"
  "testing"
  "time"
 
@@ -31,7 +31,7 @@ func (m mockedIAMClient) GetServerCertificate(*iam.GetServerCertificateInput) (*
 }
 
 func mustRead(testFile string) string {
- buf, err := ioutil.ReadFile("testdata/" + testFile)
+ buf, err := os.ReadFile("testdata/" + testFile)
  if err != nil {
  panic(err)
  }

kubernetes/adapter_test.go

@@ -5,7 +5,7 @@ import (
  "errors"
  "fmt"
  "io"
- "io/ioutil"
+ "os"
  "reflect"
  "strings"
  "testing"
@@ -498,20 +498,20 @@ func (c *mockClient) get(res string) (io.ReadCloser, error) {
  return nil, fmt.Errorf("unexpected resource: %s", res)
  }
 
- buf, err := ioutil.ReadFile(fixture)
+ buf, err := os.ReadFile(fixture)
  if err != nil {
  return nil, err
  }
- return ioutil.NopCloser(bytes.NewReader(buf)), nil
+ return io.NopCloser(bytes.NewReader(buf)), nil
 }
 
 func (c *mockClient) patch(res string, payload []byte) (io.ReadCloser, error) {
  if !c.broken {
  switch res {
  case fmt.Sprintf("/apis/%s/namespaces/default/ingresses/foo/status", IngressAPIVersionNetworking):
- return ioutil.NopCloser(strings.NewReader(":)")), nil
+ return io.NopCloser(strings.NewReader(":)")), nil
  case "/apis/zalando.org/v1/namespaces/default/routegroups/foo/status":
- return ioutil.NopCloser(strings.NewReader(":)")), nil
+ return io.NopCloser(strings.NewReader(":)")), nil
  }
  }
  return nil, errors.New("mocked error")

kubernetes/client.go

@@ -8,9 +8,9 @@ import (
  "errors"
  "fmt"
  "io"
- "io/ioutil"
  "net"
  "net/http"
+ "os"
  "strings"
  "time"
 
@@ -50,7 +50,7 @@ func newSimpleClient(cfg *Config, disableInstrumentedHttpClient bool) (client, e
  c *http.Client = http.DefaultClient
  )
  if cfg.CAFile != "" {
- fileData, err := ioutil.ReadFile(cfg.CAFile)
+ fileData, err := os.ReadFile(cfg.CAFile)
  if err != nil {
  return nil, err
  }
@@ -114,7 +114,7 @@ func (c *simpleClient) get(resource string) (io.ReadCloser, error) {
  if resp.StatusCode == http.StatusForbidden {
  return nil, ErrNoPermissionToAccessResource
  }
- b, err := ioutil.ReadAll(resp.Body)
+ b, err := io.ReadAll(resp.Body)
  if err == nil {
  err = fmt.Errorf("unexpected status code (%s) for GET %q: %s", http.StatusText(resp.StatusCode), resource, b)
  }
@@ -133,13 +133,13 @@ func (c *simpleClient) patch(resource string, payload []byte) (io.ReadCloser, er
  }
  if resp.StatusCode != http.StatusOK {
  var err error
- b, err := ioutil.ReadAll(resp.Body)
+ b, err := io.ReadAll(resp.Body)
  if err == nil {
  err = fmt.Errorf("unexpected status code (%s) for PATCH %q: %s", http.StatusText(resp.StatusCode), resource, b)
  }
 
  resp.Body.Close()
- return ioutil.NopCloser(bytes.NewBuffer(b)), err
+ return io.NopCloser(bytes.NewBuffer(b)), err
  }
  return resp.Body, nil
 }

kubernetes/client_test.go

@@ -4,7 +4,6 @@ import (
  "crypto/tls"
  "fmt"
  "io"
- "io/ioutil"
  "net/http"
  "net/http/httptest"
  "reflect"
@@ -54,7 +53,7 @@ func TestClientGet(t *testing.T) {
  }
 
  if !test.wantError {
- b, err := ioutil.ReadAll(r)
+ b, err := io.ReadAll(r)
  if err != nil {
  t.Error("error reading response", err)
  }
@@ -93,7 +92,7 @@ func TestClientPatch(t *testing.T) {
  w.WriteHeader(http.StatusBadRequest)
  return
  }
- b, err := ioutil.ReadAll(r.Body)
+ b, err := io.ReadAll(r.Body)
  if err != nil {
  t.Error("failure reading request payload", err)
  return
@@ -120,7 +119,7 @@ func TestClientPatch(t *testing.T) {
  }
 
  if !test.wantError {
- b, err := ioutil.ReadAll(r)
+ b, err := io.ReadAll(r)
  if err != nil {
  t.Error("error reading response", err)
  }
@@ -139,7 +138,7 @@ func TestTLS(t *testing.T) {
  if token != "Bearer foo" {
  t.Errorf(`wrong auth bearer token. wanted "Bearer: foo" but got %q`, token)
  }
- buf, err := ioutil.ReadAll(r.Body)
+ buf, err := io.ReadAll(r.Body)
  if err != nil {
  t.Error(err)
  }

kubernetes/config.go

@@ -1,7 +1,6 @@
 package kubernetes
 
 import (
- "io/ioutil"
  "net"
  "os"
  "time"
@@ -68,7 +67,7 @@ func InClusterConfig() (*Config, error) {
  }
 
  dir := serviceAccountLocator()
- token, err := ioutil.ReadFile(dir + serviceAccountTokenKey)
+ token, err := os.ReadFile(dir + serviceAccountTokenKey)
  if err != nil {
  return nil, err
  }

kubernetes/config_map.go

@@ -3,7 +3,7 @@ package kubernetes
 import (
  "encoding/json"
  "fmt"
- "io/ioutil"
+ "io"
 )
 
 const (
@@ -32,7 +32,7 @@ func getConfigMap(c client, namespace, name string) (*configMap, error) {
 
  defer r.Close()
 
- b, err := ioutil.ReadAll(r)
+ b, err := io.ReadAll(r)
  if err != nil {
  return nil, fmt.Errorf("failed to read ConfigMap %s/%s: %v", namespace, name, err)
  }

kubernetes/ingress.go

@@ -3,7 +3,7 @@ package kubernetes
 import (
  "encoding/json"
  "fmt"
- "io/ioutil"
+ "io"
  "time"
 )
 
@@ -104,7 +104,7 @@ func (ic *ingressClient) listIngress(c client) (*ingressList, error) {
 
  defer r.Close()
 
- b, err := ioutil.ReadAll(r)
+ b, err := io.ReadAll(r)
  if err != nil {
  return nil, err
  }

kubernetes/ingress_test.go

@@ -3,7 +3,6 @@ package kubernetes
 import (
  "fmt"
  "io"
- "io/ioutil"
  "net/http"
  "net/http/httptest"
  "os"
@@ -112,7 +111,7 @@ func TestUpdateIngressLoadBalancer(t *testing.T) {
  if !expectedContentType[ct] {
  t.Error("unexpected content type", ct)
  }
- b, err := ioutil.ReadAll(req.Body)
+ b, err := io.ReadAll(req.Body)
  if err != nil {
  t.Error(err)
  }

kubernetes/routegroup.go

@@ -3,7 +3,7 @@ package kubernetes
 import (
  "encoding/json"
  "fmt"
- "io/ioutil"
+ "io"
 )
 
 type routegroupList struct {
@@ -54,7 +54,7 @@ func listRoutegroups(c client) (*routegroupList, error) {
 
  defer r.Close()
 
- b, err := ioutil.ReadAll(r)
+ b, err := io.ReadAll(r)
  if err != nil {
  return nil, err
  }

kubernetes/routegroup_test.go

@@ -3,7 +3,6 @@ package kubernetes
 import (
  "fmt"
  "io"
- "io/ioutil"
  "net/http"
  "net/http/httptest"
  "os"
@@ -78,7 +77,7 @@ func TestUpdateRoutegroupLoadBalancer(t *testing.T) {
  if !expectedContentType[ct] {
  t.Error("unexpected content type", ct)
  }
- b, err := ioutil.ReadAll(req.Body)
+ b, err := io.ReadAll(req.Body)
  if err != nil {
  t.Error(err)
  }