no more use of ioutil.xxx

iychoi · iychoi · commit 068c680438fd · 2023-01-19T15:05:04.000-07:00
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ auth_scheme: "native"
 
 Loading a YAML file.
 ```go
-yaml, err := ioutil.ReadFile("account.yml")
+yaml, err := os.ReadFile("account.yml")
 if err != nil {
     logger.Error(err)
     panic(err)
diff --git a/examples/delete_dir/delete_dir.go b/examples/delete_dir/delete_dir.go
@@ -3,7 +3,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 
 	"github.com/cyverse/go-irodsclient/fs"
@@ -33,7 +32,7 @@ func main() {
 	inputPath := args[0]
 
 	// Read account configuration from YAML file
-	yaml, err := ioutil.ReadFile("account.yml")
+	yaml, err := os.ReadFile("account.yml")
 	if err != nil {
 		logger.Error(err)
 		panic(err)
diff --git a/examples/delete_file/delete_file.go b/examples/delete_file/delete_file.go
@@ -3,7 +3,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 
 	"github.com/cyverse/go-irodsclient/fs"
@@ -30,7 +29,7 @@ func main() {
 	inputPath := args[0]
 
 	// Read account configuration from YAML file
-	yaml, err := ioutil.ReadFile("account.yml")
+	yaml, err := os.ReadFile("account.yml")
 	if err != nil {
 		logger.Error(err)
 		panic(err)
diff --git a/examples/download/download.go b/examples/download/download.go
@@ -3,7 +3,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -33,7 +32,7 @@ func main() {
 	destPath := args[1]
 
 	// Read account configuration from YAML file
-	yaml, err := ioutil.ReadFile("account.yml")
+	yaml, err := os.ReadFile("account.yml")
 	if err != nil {
 		logger.Error(err)
 		panic(err)
diff --git a/examples/download_parallel/download_parallel.go b/examples/download_parallel/download_parallel.go
@@ -3,7 +3,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -33,7 +32,7 @@ func main() {
 	destPath := args[1]
 
 	// Read account configuration from YAML file
-	yaml, err := ioutil.ReadFile("account.yml")
+	yaml, err := os.ReadFile("account.yml")
 	if err != nil {
 		logger.Error(err)
 		panic(err)
diff --git a/examples/download_parallel_async/download_parallel_async.go b/examples/download_parallel_async/download_parallel_async.go
@@ -3,7 +3,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -33,7 +32,7 @@ func main() {
 	destPath := args[1]
 
 	// Read account configuration from YAML file
-	yaml, err := ioutil.ReadFile("account.yml")
+	yaml, err := os.ReadFile("account.yml")
 	if err != nil {
 		logger.Error(err)
 		panic(err)
diff --git a/examples/get_ticket/get_ticket.go b/examples/get_ticket/get_ticket.go
@@ -3,7 +3,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 
 	"github.com/cyverse/go-irodsclient/fs"
@@ -31,7 +30,7 @@ func main() {
 	ticketName := args[0]
 
 	// Read account configuration from YAML file
-	yaml, err := ioutil.ReadFile("account.yml")
+	yaml, err := os.ReadFile("account.yml")
 	if err != nil {
 		logger.Error(err)
 		panic(err)
diff --git a/examples/get_ticket_anon/get_ticket_anon.go b/examples/get_ticket_anon/get_ticket_anon.go
@@ -3,7 +3,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 
 	"github.com/cyverse/go-irodsclient/fs"
@@ -32,7 +31,7 @@ func main() {
 	ticketName := args[0]
 
 	// Read account configuration from YAML file
-	yaml, err := ioutil.ReadFile("account.yml")
+	yaml, err := os.ReadFile("account.yml")
 	if err != nil {
 		logger.Error(err)
 		panic(err)
diff --git a/examples/list_acls/list_acls.go b/examples/list_acls/list_acls.go
@@ -3,7 +3,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 
 	"github.com/cyverse/go-irodsclient/fs"
@@ -30,7 +29,7 @@ func main() {
 	inputPath := args[0]
 
 	// Read account configuration from YAML file
-	yaml, err := ioutil.ReadFile("account.yml")
+	yaml, err := os.ReadFile("account.yml")
 	if err != nil {
 		logger.Error(err)
 		panic(err)
diff --git a/examples/list_dir/list_dir.go b/examples/list_dir/list_dir.go
@@ -3,7 +3,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 
 	"github.com/cyverse/go-irodsclient/fs"
@@ -30,7 +29,7 @@ func main() {
 	inputPath := args[0]
 
 	// Read account configuration from YAML file
-	yaml, err := ioutil.ReadFile("account.yml")
+	yaml, err := os.ReadFile("account.yml")
 	if err != nil {
 		logger.Error(err)
 		panic(err)
diff --git a/examples/make_dir/make_dir.go b/examples/make_dir/make_dir.go
@@ -3,7 +3,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 
 	"github.com/cyverse/go-irodsclient/fs"
@@ -32,7 +31,7 @@ func main() {
 	inputPath := args[0]
 
 	// Read account configuration from YAML file
-	yaml, err := ioutil.ReadFile("account.yml")
+	yaml, err := os.ReadFile("account.yml")
 	if err != nil {
 		logger.Error(err)
 		panic(err)
diff --git a/examples/ssl_list_dir/list_dir.go b/examples/ssl_list_dir/list_dir.go
@@ -3,7 +3,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 
 	"github.com/cyverse/go-irodsclient/fs"
@@ -30,7 +29,7 @@ func main() {
 	inputPath := args[0]
 
 	// Read account configuration from YAML file
-	yaml, err := ioutil.ReadFile("account.yml")
+	yaml, err := os.ReadFile("account.yml")
 	if err != nil {
 		logger.Error(err)
 		panic(err)
diff --git a/examples/ticket_list_dir/list_dir.go b/examples/ticket_list_dir/list_dir.go
@@ -3,7 +3,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 
 	"github.com/cyverse/go-irodsclient/fs"
@@ -30,7 +29,7 @@ func main() {
 	inputPath := args[0]
 
 	// Read account configuration from YAML file
-	yaml, err := ioutil.ReadFile("account.yml")
+	yaml, err := os.ReadFile("account.yml")
 	if err != nil {
 		logger.Error(err)
 		panic(err)
diff --git a/examples/upload/upload.go b/examples/upload/upload.go
@@ -3,7 +3,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -33,7 +32,7 @@ func main() {
 	destPath := args[1]
 
 	// Read account configuration from YAML file
-	yaml, err := ioutil.ReadFile("account.yml")
+	yaml, err := os.ReadFile("account.yml")
 	if err != nil {
 		logger.Error(err)
 		panic(err)
diff --git a/examples/upload_parallel/upload_parallel.go b/examples/upload_parallel/upload_parallel.go
@@ -3,7 +3,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -33,7 +32,7 @@ func main() {
 	destPath := args[1]
 
 	// Read account configuration from YAML file
-	yaml, err := ioutil.ReadFile("account.yml")
+	yaml, err := os.ReadFile("account.yml")
 	if err != nil {
 		logger.Error(err)
 		panic(err)
diff --git a/examples/upload_parallel_async/upload_parallel_async.go b/examples/upload_parallel_async/upload_parallel_async.go
@@ -3,7 +3,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -33,7 +32,7 @@ func main() {
 	destPath := args[1]
 
 	// Read account configuration from YAML file
-	yaml, err := ioutil.ReadFile("account.yml")
+	yaml, err := os.ReadFile("account.yml")
 	if err != nil {
 		logger.Error(err)
 		panic(err)
diff --git a/examples/version/version.go b/examples/version/version.go
@@ -3,7 +3,7 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"time"
 
 	"github.com/cyverse/go-irodsclient/irods/connection"
@@ -22,7 +22,7 @@ func main() {
 	flag.Parse()
 
 	// Read account configuration from YAML file
-	yaml, err := ioutil.ReadFile("account.yml")
+	yaml, err := os.ReadFile("account.yml")
 	if err != nil {
 		logger.Error(err)
 		panic(err)
diff --git a/irods/types/ssl_config.go b/irods/types/ssl_config.go
@@ -2,7 +2,7 @@ package types
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 )
 
 // IRODSSSLConfig contains irods ssl configuration
@@ -29,9 +29,9 @@ func CreateIRODSSSLConfig(caCertFile string, keySize int, algorithm string, salt
 // ReadCACert returns CA Cert data
 func (config *IRODSSSLConfig) ReadCACert() ([]byte, error) {
 	if len(config.CACertificateFile) > 0 {
-		caCert, err := ioutil.ReadFile(config.CACertificateFile)
+		caCert, err := os.ReadFile(config.CACertificateFile)
 		if err != nil {
-			return nil, fmt.Errorf("File Read Error - %v", err)
+			return nil, err
 		}
 		return caCert, nil
 	}
diff --git a/test/testcases/main.go b/test/testcases/main.go
@@ -4,7 +4,6 @@ import (
 	"crypto/sha1"
 	"encoding/hex"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"testing"
 
@@ -97,7 +96,7 @@ func createLocalTestFile(name string, size int64) (string, error) {
 		i += len(testval)
 	}
 
-	f, err := ioutil.TempFile("", name)
+	f, err := os.CreateTemp("", name)
 	if err != nil {
 		return "", err
 	}
@@ -182,7 +181,7 @@ func prepareSamples(t *testing.T, testID string) {
 			copy(buf[startIdx:startIdx+len(testval)], testval)
 		}
 
-		err = ioutil.WriteFile(filename, buf, 0666)
+		err = os.WriteFile(filename, buf, 0666)
 		assert.NoError(t, err)
 
 		irodsPath := homedir + "/" + filename
diff --git a/utils/icommands/environment_raw.go b/utils/icommands/environment_raw.go
@@ -3,7 +3,7 @@ package icommands
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"strings"
 
 	"github.com/cyverse/go-irodsclient/irods/types"
@@ -46,7 +46,7 @@ type ICommandsEnvironment struct {
 
 // CreateICommandsEnvironmentFromFile creates ICommandsEnvironment from a file
 func CreateICommandsEnvironmentFromFile(envPath string) (*ICommandsEnvironment, error) {
-	data, err := ioutil.ReadFile(envPath)
+	data, err := os.ReadFile(envPath)
 	if err != nil {
 		return nil, err
 	}
@@ -136,5 +136,5 @@ func (env *ICommandsEnvironment) ToFile(envPath string) error {
 		return err
 	}
 
-	return ioutil.WriteFile(envPath, jsonByte, 0664)
+	return os.WriteFile(envPath, jsonByte, 0664)
 }
diff --git a/utils/icommands/password_obfuscation.go b/utils/icommands/password_obfuscation.go
@@ -1,7 +1,6 @@
 package icommands
 
 import (
-	"io/ioutil"
 	"os"
 	"time"
 )
@@ -38,7 +37,7 @@ var (
 
 // DecodePasswordFile decodes password string in .irodsA file
 func DecodePasswordFile(path string, uid int) (string, error) {
-	content, err := ioutil.ReadFile(path)
+	content, err := os.ReadFile(path)
 	if err != nil {
 		return "", err
 	}
@@ -49,7 +48,7 @@ func DecodePasswordFile(path string, uid int) (string, error) {
 // EncodePasswordFile encodes password string and store in .irodsA file
 func EncodePasswordFile(path string, s string, uid int) error {
 	content := EncodePasswordString(s, uid)
-	return ioutil.WriteFile(path, []byte(content), 0600)
+	return os.WriteFile(path, []byte(content), 0600)
 }
 
 // DecodePasswordString decodes password string in .irodsA file

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ package types`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`		`- "io/ioutil"`
	`5`	`+ "os"`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`// IRODSSSLConfig contains irods ssl configuration`
`@@ -29,9 +29,9 @@ func CreateIRODSSSLConfig(caCertFile string, keySize int, algorithm string, salt`
`29`	`29`	`// ReadCACert returns CA Cert data`
`30`	`30`	`func (config *IRODSSSLConfig) ReadCACert() ([]byte, error) {`
`31`	`31`	`if len(config.CACertificateFile) > 0 {`
`32`		`- caCert, err := ioutil.ReadFile(config.CACertificateFile)`
	`32`	`+ caCert, err := os.ReadFile(config.CACertificateFile)`
`33`	`33`	`if err != nil {`
`34`		`- return nil, fmt.Errorf("File Read Error - %v", err)`
	`34`	`+ return nil, err`
`35`	`35`	`}`
`36`	`36`	`return caCert, nil`
`37`	`37`	`}`