commit 33f61b3406637ce161245c2f496697ca13ebcb1c
author Roland Shoemaker <roland@golang.org> Tue Oct 12 09:31:08 2021 -0700
committer Roland Shoemaker <roland@golang.org> Tue Oct 12 16:43:07 2021 +0000
tree 51f90fd6c963fd729e747f505e90a9d72b6e0be0
parent 2099461b97e7a997d285192270cf0287224c11fd

cmd/gendb: switch back to ioutil Read/Write funcs

kokoro uses old go, so we need to use the pre-1.16 functions.

Change-Id: I1bb3695cf513091440d2838e83d1bdcefb99d836
Reviewed-on: https://go-review.googlesource.com/c/vulndb/+/355352
Trust: Roland Shoemaker <roland@golang.org>
Run-TryBot: Roland Shoemaker <roland@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Julie Qiu <julie@golang.org>
Reviewed-by: kokoro <noreply+kokoro@google.com>
Vulndb-Deploy: Roland Shoemaker <bracewell@google.com>

cmd/gendb/main.go

diff --git a/cmd/gendb/main.go b/cmd/gendb/main.go
index 54dac5d..36c20c0 100644
--- a/cmd/gendb/main.go
+++ b/cmd/gendb/main.go
@@ -8,6 +8,7 @@
 	"encoding/json"
 	"flag"
 	"fmt"
+	"io/ioutil"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -30,7 +31,7 @@
 
 func matchesCurrent(path string, new []osv.Entry) bool {
 	var current []osv.Entry
-	content, err := os.ReadFile(path + ".json")
+	content, err := ioutil.ReadFile(path + ".json")
 	if err != nil {
 		return false
 	}
@@ -45,7 +46,7 @@
 	jsonDir := flag.String("out", "out", "Directory to write JSON database to")
 	flag.Parse()
 
-	yamlFiles, err := os.ReadDir(*yamlDir)
+	yamlFiles, err := ioutil.ReadDir(*yamlDir)
 	if err != nil {
 		failf("can't read %q: %s", *yamlDir, err)
 	}
@@ -56,7 +57,7 @@
 		if !strings.HasSuffix(f.Name(), ".yaml") {
 			continue
 		}
-		content, err := os.ReadFile(filepath.Join(*yamlDir, f.Name()))
+		content, err := ioutil.ReadFile(filepath.Join(*yamlDir, f.Name()))
 		if err != nil {
 			failf("can't read %q: %s", f.Name(), err)
 		}
@@ -94,7 +95,7 @@
 		if err := os.MkdirAll(filepath.Dir(outPath), 0700); err != nil {
 			failf("failed to create directory %q: %s", filepath.Dir(outPath), err)
 		}
-		if err := os.WriteFile(outPath+".json", content, 0644); err != nil {
+		if err := ioutil.WriteFile(outPath+".json", content, 0644); err != nil {
 			failf("failed to write %q: %s", outPath+".json", err)
 		}
 		for _, v := range vulns {
@@ -108,7 +109,7 @@
 	if err != nil {
 		failf("failed to marshal index json: %s", err)
 	}
-	if err := os.WriteFile(filepath.Join(*jsonDir, "index.json"), indexJSON, 0644); err != nil {
+	if err := ioutil.WriteFile(filepath.Join(*jsonDir, "index.json"), indexJSON, 0644); err != nil {
 		failf("failed to write index: %s", err)
 	}
 
@@ -123,7 +124,7 @@
 		if err != nil {
 			failf("failed to marshal json: %v", err)
 		}
-		if err := os.WriteFile(outPath, content, 0644); err != nil {
+		if err := ioutil.WriteFile(outPath, content, 0644); err != nil {
 			failf("failed to write %q: %v", outPath, err)
 		}
 	}