refactor: move from io/ioutil to io and os package (#2236)

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-10-23 17:14:12 +05:30
committed by GitHub
parent e641246866
commit 2f4ec4b2b9
40 changed files with 101 additions and 117 deletions
+3 -3
View File
@@ -18,7 +18,7 @@ package function
import (
"context"
"io/ioutil"
"io"
"net/http"
"net/url"
"os"
@@ -131,7 +131,7 @@ func (opts *TestSubCommand) do(input cli.Input) error {
}
defer resp.Body.Close()
body, err := ioutil.ReadAll(resp.Body)
body, err := io.ReadAll(resp.Body)
if err != nil {
return errors.Wrap(err, "error reading response from function")
}
@@ -201,7 +201,7 @@ func printPodLogs(client client.Interface, fnMeta *metav1.ObjectMeta) (string, e
}
defer reader.Close()
body, err := ioutil.ReadAll(reader)
body, err := io.ReadAll(reader)
if err != nil {
return "", errors.Wrap(err, "error reading the response body")
}
+1 -2
View File
@@ -19,7 +19,6 @@ import (
"context"
"fmt"
"io"
"io/ioutil"
"net/http"
"net/url"
"os"
@@ -86,7 +85,7 @@ func UploadArchiveFile(ctx context.Context, client client.Interface, fileName st
}
func GetContents(filePath string) ([]byte, error) {
code, err := ioutil.ReadFile(filePath)
code, err := os.ReadFile(filePath)
if err != nil {
return nil, errors.Wrapf(err, "error reading %v", filePath)
}
+1 -2
View File
@@ -19,7 +19,6 @@ package spec
import (
"context"
"fmt"
"io/ioutil"
"os"
"path/filepath"
"reflect"
@@ -487,7 +486,7 @@ func localArchiveFromSpec(specDir string, aus *spectypes.ArchiveUploadSpec) (*fv
if len(files) > 1 || !isSingleFile {
// zip up the file list
archiveFile, err := ioutil.TempFile("", fmt.Sprintf("fission-archive-%v", aus.Name))
archiveFile, err := os.CreateTemp("", fmt.Sprintf("fission-archive-%v", aus.Name))
if err != nil {
return nil, err
}
+2 -3
View File
@@ -18,7 +18,6 @@ package spec
import (
"fmt"
"io/ioutil"
"os"
"path/filepath"
@@ -110,7 +109,7 @@ func (opts *InitSubCommand) run(input cli.Input) error {
}
// Add a bit of documentation to the spec dir here
err := ioutil.WriteFile(readme, []byte(SPEC_README), 0644)
err := os.WriteFile(readme, []byte(SPEC_README), 0644)
if err != nil {
return err
}
@@ -138,7 +137,7 @@ func writeDeploymentConfig(file string, dc *spectypes.DeploymentConfig) error {
"# See the README in this directory for background and usage information.\n" +
"# Do not edit the UID below: that will break 'fission spec apply'\n")
err = ioutil.WriteFile(file, append(msg, y...), 0644)
err = os.WriteFile(file, append(msg, y...), 0644)
if err != nil {
return err
}
+1 -2
View File
@@ -19,7 +19,6 @@ package spec
import (
"bytes"
"fmt"
"io/ioutil"
"os"
"path/filepath"
"strings"
@@ -234,7 +233,7 @@ func ReadSpecs(specDir string) (*FissionResources, error) {
return nil
}
// read
b, err := ioutil.ReadFile(path)
b, err := os.ReadFile(path)
if err != nil {
result = multierror.Append(result, err)
return nil
@@ -18,7 +18,7 @@ package resources
import (
"fmt"
"io/ioutil"
"os"
"path/filepath"
"github.com/ghodss/yaml"
@@ -55,7 +55,7 @@ func writeToFile(file string, obj interface{}) {
// remove the empty byte from string.
file = string(utils.RemoveZeroBytes([]byte(file)))
err = ioutil.WriteFile(file, bs, 0644)
err = os.WriteFile(file, bs, 0644)
if err != nil {
console.Error(fmt.Sprintf("Error writing file %v: %v", file, err))
}