all: ioutil is deprecated in go1.19 (#3718)

3 files changed, 6 insertions, 9 deletions

diff --git a/syz-ci/jobs.go b/syz-ci/jobs.go
index e7028b97a..2ab6644fd 100644
--- a/syz-ci/jobs.go
+++ b/syz-ci/jobs.go
@@ -7,7 +7,6 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -460,7 +459,7 @@ func (jp *JobProcessor) bisect(job *Job, mgrcfg *mgrconfig.Config) error {
 	// Read possible baseline for config minimization.
 	if mgr.mgrcfg.KernelBaselineConfig != "" {
 		var err error
-		baseline, err = ioutil.ReadFile(mgr.mgrcfg.KernelBaselineConfig)
+		baseline, err = os.ReadFile(mgr.mgrcfg.KernelBaselineConfig)
 		if err != nil {
 			return fmt.Errorf("failed to read baseline config: %v", err)
 		}
@@ -646,7 +645,7 @@ func (jp *JobProcessor) testPatch(job *Job, mgrcfg *mgrconfig.Config) error {
 		return err
 	}
 	if kernelConfig != "" {
-		resp.Build.KernelConfig, err = ioutil.ReadFile(kernelConfig)
+		resp.Build.KernelConfig, err = os.ReadFile(kernelConfig)
 		if err != nil {
 			return fmt.Errorf("failed to read config file: %v", err)
 		}
diff --git a/syz-ci/manager.go b/syz-ci/manager.go
index 077358509..2af4e1558 100644
--- a/syz-ci/manager.go
+++ b/syz-ci/manager.go
@@ -7,7 +7,6 @@ import (
 	"crypto/sha256"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/url"
 	"os"
@@ -114,7 +113,7 @@ func createManager(cfg *Config, mgrcfg *ManagerConfig, stop chan struct{},
 	}
 	var configData []byte
 	if mgrcfg.KernelConfig != "" {
-		if configData, err = ioutil.ReadFile(mgrcfg.KernelConfig); err != nil {
+		if configData, err = os.ReadFile(mgrcfg.KernelConfig); err != nil {
 			return nil, err
 		}
 	}
@@ -607,7 +606,7 @@ func (mgr *Manager) createDashboardBuild(info *BuildInfo, imageDir, typ string)
 	var kernelConfig []byte
 	if kernelConfigFile := filepath.Join(imageDir, "kernel.config"); osutil.IsExist(kernelConfigFile) {
 		var err error
-		if kernelConfig, err = ioutil.ReadFile(kernelConfigFile); err != nil {
+		if kernelConfig, err = os.ReadFile(kernelConfigFile); err != nil {
 			return nil, fmt.Errorf("failed to read kernel.config: %v", err)
 		}
 	}
diff --git a/syz-ci/updater.go b/syz-ci/updater.go
index c20dd2f92..bade54333 100644
--- a/syz-ci/updater.go
+++ b/syz-ci/updater.go
@@ -5,7 +5,6 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -226,7 +225,7 @@ func (upd *SyzUpdater) build(commit *vcs.Commit) error {
 	defer buildSem.Signal()
 
 	if upd.descriptions != "" {
-		files, err := ioutil.ReadDir(upd.descriptions)
+		files, err := os.ReadDir(upd.descriptions)
 		if err != nil {
 			return fmt.Errorf("failed to read descriptions dir: %v", err)
 		}
@@ -347,6 +346,6 @@ func (upd *SyzUpdater) checkLatest() string {
 	if !osutil.FilesExist(upd.latestDir, upd.syzFiles) {
 		return ""
 	}
-	tag, _ := ioutil.ReadFile(filepath.Join(upd.latestDir, "tag"))
+	tag, _ := os.ReadFile(filepath.Join(upd.latestDir, "tag"))
 	return string(tag)
 }