github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

refactor: move from io/ioutil to io and os package

Browse Source 
The io/ioutil package has been deprecated as of Go 1.16, see
https://golang.org/doc/go1.16#ioutil. This commit replaces the existing
io/ioutil functions with their new definitions in io and os packages.

Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
This commit is contained in:
Eng Zer Jun
2021-09-10 20:28:11 +08:00
parent c16be1a5e2
commit 50da673592
126 changed files with 291 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
runtime/v2/runc/container.go
View File

@@ -22,7 +22,6 @@ package runc
import (
"context"
"encoding/json"
"io/ioutil"
"os"
"path/filepath"
"sync"
@@ -175,7 +174,7 @@ func ReadOptions(path string) (*options.Options, error) {
return nil, err
}
data, err := ioutil.ReadFile(filePath)
data, err := os.ReadFile(filePath)
if err != nil {
return nil, err
}
@@ -192,12 +191,12 @@ func WriteOptions(path string, opts options.Options) error {
if err != nil {
return err
}
return ioutil.WriteFile(filepath.Join(path, optionsFilename), data, 0600)
return os.WriteFile(filepath.Join(path, optionsFilename), data, 0600)
}
// ReadRuntime reads the runtime information from the path
func ReadRuntime(path string) (string, error) {
data, err := ioutil.ReadFile(filepath.Join(path, "runtime"))
data, err := os.ReadFile(filepath.Join(path, "runtime"))
if err != nil {
return "", err
}
@@ -206,7 +205,7 @@ func ReadRuntime(path string) (string, error) {
// WriteRuntime writes the runtime information into the path
func WriteRuntime(path, runtime string) error {
return ioutil.WriteFile(filepath.Join(path, "runtime"), []byte(runtime), 0600)
return os.WriteFile(filepath.Join(path, "runtime"), []byte(runtime), 0600)
}
func newInit(ctx context.Context, path, workDir, namespace string, platform stdio.Platform,

4
runtime/v2/runc/util.go
View File

@@ -22,7 +22,7 @@ package runc
import (
"context"
"encoding/json"
"io/ioutil"
"os"
"path/filepath"
"github.com/containerd/containerd/api/events"
@@ -66,7 +66,7 @@ func GetTopic(e interface{}) string {
// there is an error reading the spec or if the container has a private PID namespace
func ShouldKillAllOnExit(ctx context.Context, bundlePath string) bool {
var bundleSpec specs.Spec
bundleConfigContents, err := ioutil.ReadFile(filepath.Join(bundlePath, "config.json"))
bundleConfigContents, err := os.ReadFile(filepath.Join(bundlePath, "config.json"))
if err != nil {
log.G(ctx).WithError(err).Error("shouldKillAllOnExit: failed to read config.json")
return true

4
runtime/v2/runc/v1/service.go
View File

@@ -21,7 +21,7 @@ package v1
import (
"context"
"io/ioutil"
"io"
"os"
"path/filepath"
"sync"
@@ -180,7 +180,7 @@ func (s *service) StartShim(ctx context.Context, opts shim.StartOpts) (_ string,
if err := shim.WritePidFile("shim.pid", cmd.Process.Pid); err != nil {
return "", err
}
if data, err := ioutil.ReadAll(os.Stdin); err == nil {
if data, err := io.ReadAll(os.Stdin); err == nil {
if len(data) > 0 {
var any ptypes.Any
if err := proto.Unmarshal(data, &any); err != nil {

4
runtime/v2/runc/v2/service.go
View File

@@ -22,7 +22,7 @@ package v2
import (
"context"
"encoding/json"
"io/ioutil"
"io"
"os"
"path/filepath"
"sync"
@@ -245,7 +245,7 @@ func (s *service) StartShim(ctx context.Context, opts shim.StartOpts) (_ string,
}()
// make sure to wait after start
go cmd.Wait()
if data, err := ioutil.ReadAll(os.Stdin); err == nil {
if data, err := io.ReadAll(os.Stdin); err == nil {
if len(data) > 0 {
var any ptypes.Any
if err := proto.Unmarshal(data, &any); err != nil {