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

5
runtime/v1/linux/bundle.go
View File

@@ -23,7 +23,6 @@ import (
"context"
"crypto/sha256"
"fmt"
"io/ioutil"
"os"
"path/filepath"
@@ -70,7 +69,7 @@ func newBundle(id, path, workDir string, spec []byte) (b *bundle, err error) {
if err := os.MkdirAll(rootfs, 0711); err != nil {
return nil, err
}
err = ioutil.WriteFile(filepath.Join(path, configFilename), spec, 0666)
err = os.WriteFile(filepath.Join(path, configFilename), spec, 0666)
return &bundle{
id: id,
path: path,
@@ -148,7 +147,7 @@ func (b *bundle) shimAddress(namespace, socketPath string) string {
func (b *bundle) loadAddress() (string, error) {
addressPath := filepath.Join(b.path, "address")
data, err := ioutil.ReadFile(addressPath)
data, err := os.ReadFile(addressPath)
if err != nil {
return "", err
}

9
runtime/v1/linux/runtime.go
View File

@@ -23,7 +23,6 @@ import (
"context"
"fmt"
"io"
"io/ioutil"
"os"
"path/filepath"
"time"
@@ -288,7 +287,7 @@ func (r *Runtime) Tasks(ctx context.Context, all bool) ([]runtime.Task, error) {
}
func (r *Runtime) restoreTasks(ctx context.Context) ([]*Task, error) {
dir, err := ioutil.ReadDir(r.state)
dir, err := os.ReadDir(r.state)
if err != nil {
return nil, err
}
@@ -340,7 +339,7 @@ func (r *Runtime) Delete(ctx context.Context, id string) (*runtime.Exit, error)
}
func (r *Runtime) loadTasks(ctx context.Context, ns string) ([]*Task, error) {
dir, err := ioutil.ReadDir(filepath.Join(r.state, ns))
dir, err := os.ReadDir(filepath.Join(r.state, ns))
if err != nil {
return nil, err
}
@@ -413,7 +412,7 @@ func (r *Runtime) loadTasks(ctx context.Context, ns string) ([]*Task, error) {
if r.config.ShimDebug {
go copyAndClose(os.Stdout, shimStdoutLog)
} else {
go copyAndClose(ioutil.Discard, shimStdoutLog)
go copyAndClose(io.Discard, shimStdoutLog)
}
shimStderrLog, err := v1.OpenShimStderrLog(ctx, logDirPath)
@@ -428,7 +427,7 @@ func (r *Runtime) loadTasks(ctx context.Context, ns string) ([]*Task, error) {
if r.config.ShimDebug {
go copyAndClose(os.Stderr, shimStderrLog)
} else {
go copyAndClose(ioutil.Discard, shimStderrLog)
go copyAndClose(io.Discard, shimStderrLog)
}
t, err := newTask(id, ns, pid, s, r.events, r.tasks, bundle)

5
runtime/v1/shim/client/client.go
View File

@@ -23,7 +23,6 @@ import (
"context"
"fmt"
"io"
"io/ioutil"
"net"
"os"
"path/filepath"
@@ -75,8 +74,8 @@ func WithStart(binary, address, daemonAddress, cgroup string, debug bool, exitHa
}
defer f.Close()
stdoutCopy := ioutil.Discard
stderrCopy := ioutil.Discard
stdoutCopy := io.Discard
stderrCopy := io.Discard
stdoutLog, err := v1.OpenShimStdoutLog(ctx, config.WorkDir)
if err != nil {
return nil, nil, errors.Wrapf(err, "failed to create stdout log")

3
runtime/v1/shim/service.go
View File

@@ -23,7 +23,6 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"os"
"path/filepath"
"sync"
@@ -543,7 +542,7 @@ func (s *Service) checkProcesses(e runc.Exit) {
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

3
runtime/v2/bundle.go
View File

@@ -19,7 +19,6 @@ package v2
import (
"context"
"fmt"
"io/ioutil"
"os"
"path/filepath"
@@ -100,7 +99,7 @@ func NewBundle(ctx context.Context, root, state, id string, spec []byte) (b *Bun
return nil, err
}
// write the spec to the bundle
err = ioutil.WriteFile(filepath.Join(b.Path, configFilename), spec, 0666)
err = os.WriteFile(filepath.Join(b.Path, configFilename), spec, 0666)
return b, err
}

9
runtime/v2/manager.go
View File

@@ -19,7 +19,6 @@ package v2
import (
"context"
"fmt"
"io/ioutil"
"os"
"path/filepath"
@@ -234,7 +233,7 @@ func (m *TaskManager) Tasks(ctx context.Context, all bool) ([]runtime.Task, erro
}
func (m *TaskManager) loadExistingTasks(ctx context.Context) error {
nsDirs, err := ioutil.ReadDir(m.state)
nsDirs, err := os.ReadDir(m.state)
if err != nil {
return err
}
@@ -265,7 +264,7 @@ func (m *TaskManager) loadTasks(ctx context.Context) error {
if err != nil {
return err
}
shimDirs, err := ioutil.ReadDir(filepath.Join(m.state, ns))
shimDirs, err := os.ReadDir(filepath.Join(m.state, ns))
if err != nil {
return err
}
@@ -285,7 +284,7 @@ func (m *TaskManager) loadTasks(ctx context.Context) error {
return err
}
// fast path
bf, err := ioutil.ReadDir(bundle.Path)
bf, err := os.ReadDir(bundle.Path)
if err != nil {
bundle.Delete()
log.G(ctx).WithError(err).Errorf("fast path read bundle path for %s", bundle.Path)
@@ -334,7 +333,7 @@ func (m *TaskManager) cleanupWorkDirs(ctx context.Context) error {
if err != nil {
return err
}
dirs, err := ioutil.ReadDir(filepath.Join(m.root, ns))
dirs, err := os.ReadDir(filepath.Join(m.root, ns))
if err != nil {
return err
}

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 {

3
runtime/v2/shim.go
View File

@@ -19,7 +19,6 @@ package v2
import (
"context"
"io"
"io/ioutil"
"os"
"path/filepath"
"time"
@@ -55,7 +54,7 @@ func init() {
}
func loadAddress(path string) (string, error) {
data, err := ioutil.ReadFile(path)
data, err := os.ReadFile(path)
if err != nil {
return "", err
}

3
runtime/v2/shim/util.go
View File

@@ -20,7 +20,6 @@ import (
"bytes"
"context"
"fmt"
"io/ioutil"
"net"
"os"
"path/filepath"
@@ -193,7 +192,7 @@ func ReadAddress(path string) (string, error) {
if err != nil {
return "", err
}
data, err := ioutil.ReadFile(path)
data, err := os.ReadFile(path)
if err != nil {
return "", err
}