Skip to content

Commit c957d8f

Browse files
cuishuangneild
authored andcommitted
all: replace io/ioutil with io and os package
Change-Id: I3c6860d1758ac49b13fbb545e1e1957e345153ae GitHub-Last-Rev: 9f43b2b GitHub-Pull-Request: #997 Reviewed-on: https://go-review.googlesource.com/c/vulndb/+/430855 TryBot-Result: Gopher Robot <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]> Reviewed-by: Damien Neil <[email protected]> Run-TryBot: Damien Neil <[email protected]>
1 parent afc949c commit c957d8f

File tree

6 files changed

+9
-13
lines changed

6 files changed

+9
-13
lines changed

all_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ package main
99

1010
import (
1111
"errors"
12-
"io/ioutil"
1312
"os"
1413
"os/exec"
1514
"path/filepath"
@@ -50,7 +49,7 @@ func TestLintReports(t *testing.T) {
5049
allFiles := make(map[string]string)
5150
var reports []string
5251
for _, dir := range []string{reportsDir, excludedDir} {
53-
files, err := ioutil.ReadDir(dir)
52+
files, err := os.ReadDir(dir)
5453
if err != nil && !errors.Is(err, os.ErrNotExist) {
5554
t.Fatalf("unable to read %v/: %s", dir, err)
5655
}

cmd/worker/main.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"errors"
1515
"flag"
1616
"fmt"
17-
"io/ioutil"
1817
"net/http"
1918
"os"
2019
"strings"
@@ -76,7 +75,7 @@ func main() {
7675

7776
flag.Parse()
7877
if *githubTokenFile != "" {
79-
data, err := ioutil.ReadFile(*githubTokenFile)
78+
data, err := os.ReadFile(*githubTokenFile)
8079
if err != nil {
8180
die("%v", err)
8281
}

internal/database/generate.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"context"
1010
"encoding/json"
1111
"fmt"
12-
"io/ioutil"
1312
"os"
1413
"path/filepath"
1514
"sort"
@@ -97,7 +96,7 @@ func generateEntries(ctx context.Context, repoDir string) (map[string][]osv.Entr
9796
return nil, nil, err
9897
}
9998

100-
yamlFiles, err := ioutil.ReadDir(filepath.Join(repoDir, yamlDir))
99+
yamlFiles, err := os.ReadDir(filepath.Join(repoDir, yamlDir))
101100
if err != nil {
102101
return nil, nil, fmt.Errorf("can't read %q: %s", yamlDir, err)
103102
}

internal/database/load.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package database
77
import (
88
"encoding/json"
99
"fmt"
10-
"io/ioutil"
10+
"os"
1111
"path/filepath"
1212
"strings"
1313

@@ -46,7 +46,7 @@ func loadDB(dbPath string) (_ client.DBIndex, _ map[string][]osv.Entry, err erro
4646

4747
var loadDir func(string) error
4848
loadDir = func(path string) error {
49-
dir, err := ioutil.ReadDir(path)
49+
dir, err := os.ReadDir(path)
5050
if err != nil {
5151
return err
5252
}
@@ -58,7 +58,7 @@ func loadDB(dbPath string) (_ client.DBIndex, _ map[string][]osv.Entry, err erro
5858
}
5959
continue
6060
}
61-
content, err := ioutil.ReadFile(fpath)
61+
content, err := os.ReadFile(fpath)
6262
if err != nil {
6363
return err
6464
}

internal/issues/issues_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ package issues
1010
import (
1111
"context"
1212
"flag"
13-
"io/ioutil"
13+
"os"
1414
"strings"
1515
"testing"
1616

@@ -37,7 +37,7 @@ func TestClient(t *testing.T) {
3737
if *githubTokenFile == "" {
3838
t.Fatal("need -ghtokenfile")
3939
}
40-
data, err := ioutil.ReadFile(*githubTokenFile)
40+
data, err := os.ReadFile(*githubTokenFile)
4141
if err != nil {
4242
t.Fatal(err)
4343
}

internal/worker/gen_false_positives.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"context"
2323
"fmt"
2424
"go/format"
25-
"io/ioutil"
2625
"log"
2726
"os"
2827
"strings"
@@ -288,7 +287,7 @@ func run(repoPath string) error {
288287
if err != nil {
289288
return err
290289
}
291-
return ioutil.WriteFile("false_positive_records.gen.go", src, 0644)
290+
return os.WriteFile("false_positive_records.gen.go", src, 0644)
292291
}
293292

294293
func buildCVERecords(repo *git.Repository) ([]*store.CVERecord, error) {

0 commit comments

Comments
 (0)