client,cmd/govulncheck: remove ioutil package
Change-Id: I26fe6a8e7ede1d500bae6977085f63354ee21344
Reviewed-on: https://go-review.googlesource.com/c/vuln/+/418915
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Jonathan Amsterdam <jba@google.com>
Reviewed-by: Zvonimir Pavlinovic <zpavlinovic@google.com>
diff --git a/client/client.go b/client/client.go
index facdbd8..53d5437 100644
--- a/client/client.go
+++ b/client/client.go
@@ -32,7 +32,7 @@
"context"
"encoding/json"
"fmt"
- "io/ioutil"
+ "io"
"net/http"
"net/url"
"os"
@@ -84,7 +84,7 @@
func (ls *localSource) GetByModule(_ context.Context, module string) (_ []*osv.Entry, err error) {
defer derrors.Wrap(&err, "GetByModule(%q)", module)
- content, err := ioutil.ReadFile(filepath.Join(ls.dir, module+".json"))
+ content, err := os.ReadFile(filepath.Join(ls.dir, module+".json"))
if os.IsNotExist(err) {
return nil, nil
} else if err != nil {
@@ -99,7 +99,7 @@
func (ls *localSource) GetByID(_ context.Context, id string) (_ *osv.Entry, err error) {
defer derrors.Wrap(&err, "GetByID(%q)", id)
- content, err := ioutil.ReadFile(filepath.Join(ls.dir, internal.IDDirectory, id+".json"))
+ content, err := os.ReadFile(filepath.Join(ls.dir, internal.IDDirectory, id+".json"))
if os.IsNotExist(err) {
return nil, nil
} else if err != nil {
@@ -114,7 +114,7 @@
func (ls *localSource) ListIDs(context.Context) (_ []string, err error) {
defer derrors.Wrap(&err, "ListIDs()")
- content, err := ioutil.ReadFile(filepath.Join(ls.dir, internal.IDDirectory, "index.json"))
+ content, err := os.ReadFile(filepath.Join(ls.dir, internal.IDDirectory, "index.json"))
if err != nil {
return nil, err
}
@@ -139,7 +139,7 @@
func (ls *localSource) Index(context.Context) (_ DBIndex, err error) {
defer derrors.Wrap(&err, "Index()")
var index DBIndex
- b, err := ioutil.ReadFile(filepath.Join(ls.dir, "index.json"))
+ b, err := os.ReadFile(filepath.Join(ls.dir, "index.json"))
if err != nil {
return nil, err
}
@@ -202,7 +202,7 @@
if resp.StatusCode != http.StatusOK {
return nil, fmt.Errorf("unexpected status code: %d", resp.StatusCode)
}
- b, err := ioutil.ReadAll(resp.Body)
+ b, err := io.ReadAll(resp.Body)
if err != nil {
return nil, err
}
@@ -337,7 +337,7 @@
return nil, nil
}
// might want this to be a LimitedReader
- return ioutil.ReadAll(resp.Body)
+ return io.ReadAll(resp.Body)
}
type client struct {
diff --git a/client/client_test.go b/client/client_test.go
index e7bc1d1..46958da 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -9,7 +9,6 @@
"encoding/json"
"fmt"
"io"
- "io/ioutil"
"net/http"
"net/http/httptest"
"net/url"
@@ -116,7 +115,7 @@
if err := os.MkdirAll(dir, 0755); err != nil {
return err
}
- return ioutil.WriteFile(path.Join(dir, file), []byte(content), 0644)
+ return os.WriteFile(path.Join(dir, file), []byte(content), 0644)
}
// localDB creates a local db with testVulns and index as contents.
diff --git a/cmd/govulncheck/integration/k8s/k8s.go b/cmd/govulncheck/integration/k8s/k8s.go
index d844c62..f72028a 100644
--- a/cmd/govulncheck/integration/k8s/k8s.go
+++ b/cmd/govulncheck/integration/k8s/k8s.go
@@ -6,7 +6,6 @@
import (
"encoding/json"
- "io/ioutil"
"log"
"os"
@@ -25,7 +24,7 @@
}
out := os.Args[1]
- outJson, err := ioutil.ReadFile(out)
+ outJson, err := os.ReadFile(out)
if err != nil {
log.Fatal("Failed to read:", out)
}
diff --git a/cmd/govulncheck/internal/govulncheck/cache.go b/cmd/govulncheck/internal/govulncheck/cache.go
index 0948837..a995504 100644
--- a/cmd/govulncheck/internal/govulncheck/cache.go
+++ b/cmd/govulncheck/internal/govulncheck/cache.go
@@ -8,7 +8,6 @@
import (
"encoding/json"
"go/build"
- "io/ioutil"
"os"
"path/filepath"
"sync"
@@ -63,7 +62,7 @@
c.mu.Lock()
defer c.mu.Unlock()
- b, err := ioutil.ReadFile(filepath.Join(c.rootDir, dbName, "index.json"))
+ b, err := os.ReadFile(filepath.Join(c.rootDir, dbName, "index.json"))
if err != nil {
if os.IsNotExist(err) {
return nil, time.Time{}, nil
@@ -92,7 +91,7 @@
if err != nil {
return err
}
- if err := ioutil.WriteFile(filepath.Join(path, "index.json"), j, 0666); err != nil {
+ if err := os.WriteFile(filepath.Join(path, "index.json"), j, 0666); err != nil {
return err
}
return nil
@@ -102,7 +101,7 @@
c.mu.Lock()
defer c.mu.Unlock()
- b, err := ioutil.ReadFile(filepath.Join(c.rootDir, dbName, p, "vulns.json"))
+ b, err := os.ReadFile(filepath.Join(c.rootDir, dbName, p, "vulns.json"))
if err != nil {
if os.IsNotExist(err) {
return nil, nil
@@ -128,7 +127,7 @@
if err != nil {
return err
}
- if err := ioutil.WriteFile(filepath.Join(path, "vulns.json"), j, 0666); err != nil {
+ if err := os.WriteFile(filepath.Join(path, "vulns.json"), j, 0666); err != nil {
return err
}
return nil
