package errors

Author: Lucas Yoon

pkg/utils/overriding/merging_test.go

@@ -17,7 +17,6 @@
 package overriding
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -49,7 +48,7 @@ func TestMerging(t *testing.T) {
 				t.Error(err)
 				return nil
 			}
-			main, err := ioutil.ReadFile(path)
+			main, err := os.ReadFile(path)
 			if err != nil {
 				t.Error(err)
 				return nil
@@ -58,7 +57,7 @@ func TestMerging(t *testing.T) {
 			parent := []byte{}
 			parentFile := filepath.Join(dirPath, "parent.yaml")
 			if _, err = os.Stat(parentFile); err == nil {
-				parent, err = ioutil.ReadFile(parentFile)
+				parent, err = os.ReadFile(parentFile)
 				if err != nil {
 					t.Error(err)
 					return nil
@@ -68,7 +67,7 @@ func TestMerging(t *testing.T) {
 			plugins := [][]byte{}
 			pluginFile := filepath.Join(dirPath, "plugin.yaml")
 			if _, err = os.Stat(pluginFile); err == nil {
-				plugin, err := ioutil.ReadFile(filepath.Join(dirPath, "plugin.yaml"))
+				plugin, err := os.ReadFile(filepath.Join(dirPath, "plugin.yaml"))
 				if err != nil {
 					t.Error(err)
 					return nil
@@ -79,7 +78,7 @@ func TestMerging(t *testing.T) {
 			resultError := ""
 			errorFile := filepath.Join(dirPath, "result-error.txt")
 			if _, err = os.Stat(errorFile); err == nil {
-				resultErrorBytes, err := ioutil.ReadFile(errorFile)
+				resultErrorBytes, err := os.ReadFile(errorFile)
 				if err != nil {
 					t.Error(err)
 					return nil

pkg/utils/overriding/overriding_test.go

@@ -17,7 +17,6 @@
 package overriding
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -200,13 +199,13 @@ func TestOverridingPatches(t *testing.T) {
 				t.Error(err)
 				return nil
 			}
-			original, err := ioutil.ReadFile(path)
+			original, err := os.ReadFile(path)
 			if err != nil {
 				t.Error(err)
 				return nil
 			}
 			dirPath := filepath.Dir(path)
-			patch, err := ioutil.ReadFile(filepath.Join(dirPath, "patch.yaml"))
+			patch, err := os.ReadFile(filepath.Join(dirPath, "patch.yaml"))
 			if err != nil {
 				t.Error(err)
 				return nil
@@ -215,7 +214,7 @@ func TestOverridingPatches(t *testing.T) {
 			resultError := ""
 			errorFile := filepath.Join(dirPath, "result-error.txt")
 			if _, err = os.Stat(errorFile); err == nil {
-				resultErrorBytes, err := ioutil.ReadFile(errorFile)
+				resultErrorBytes, err := os.ReadFile(errorFile)
 				if err != nil {
 					t.Error(err)
 					return nil
@@ -252,7 +251,7 @@ func TestPluginOverrides(t *testing.T) {
 }
 
 func readFileToStruct(t *testing.T, path string, into interface{}) {
-	bytes, err := ioutil.ReadFile(path)
+	bytes, err := os.ReadFile(path)
 	if err != nil {
 		t.Fatalf("Failed to read test file from %s: %s", path, err.Error())
 	}

pkg/validation/variables/variables_test.go

@@ -17,7 +17,6 @@
 package variables
 
 import (
-	"io/ioutil"
 	"reflect"
 	"testing"
 
@@ -174,7 +173,7 @@ func TestValidateAndReplaceDataWithVariable(t *testing.T) {
 }
 
 func readFileToStruct(t *testing.T, path string, into interface{}) {
-	bytes, err := ioutil.ReadFile(path)
+	bytes, err := os.ReadFile(path)
 	if err != nil {
 		t.Fatalf("Failed to read test file from %s: %s", path, err.Error())
 	}

test/v200/schemaTest/schema_test.go

@@ -21,7 +21,7 @@ import (
 	"encoding/json"
 	"github.com/ghodss/yaml"
 	"github.com/santhosh-tekuri/jsonschema"
-	"io/ioutil"
+	"io"
 	"os"
 	"path/filepath"
 	"strings"
@@ -62,7 +62,7 @@ func Test_Schema(t *testing.T) {
 	os.Mkdir(tempDir, 0755)
 
 	// Read the content of the jso directory to find test files
-	files, err := ioutil.ReadDir(jsonDir)
+	files, err := os.ReadDir(jsonDir)
 	if err != nil {
 		t.Fatalf("Error finding test json files in : %s :  %v", jsonDir, err)
 	}
@@ -82,7 +82,7 @@ func Test_Schema(t *testing.T) {
 			}
 
 			// Read contents of the json file which defines the tests to run
-			byteValue, err := ioutil.ReadAll(testJson)
+			byteValue, err := io.ReadAll(testJson)
 			if err != nil {
 				t.Errorf("FAIL : failed to read : %s : %v", testJsonFile.Name(), err)
 			}
@@ -127,7 +127,7 @@ func Test_Schema(t *testing.T) {
 				}
 
 				// Read contents of the json file which defines the tests to run
-				byteValue, err := ioutil.ReadAll(testsToRunJson)
+				byteValue, err := io.ReadAll(testsToRunJson)
 				if err != nil {
 					t.Fatalf("FAIL : failed to read : %s : %v", testJsonContent.Tests[m], err)
 				}
@@ -165,7 +165,7 @@ func Test_Schema(t *testing.T) {
 						// Now add each of the yaml sippets used the make the yaml file for test
 						for j := 0; j < len(testsToRunContent.Tests[i].Files); j++ {
 							// Read the snippet
-							data, err := ioutil.ReadFile(filepath.Join(testDir, testsToRunContent.Tests[i].Files[j]))
+							data, err := os.ReadFile(filepath.Join(testDir, testsToRunContent.Tests[i].Files[j]))
 							if err != nil {
 								t.Errorf("FAIL: failed reading %s: %v", filepath.Join(testDir, testsToRunContent.Tests[i].Files[j]), err)
 								testYamlComplete = false
@@ -186,7 +186,7 @@ func Test_Schema(t *testing.T) {
 						}
 
 						// Read the created yaml file, ready for converison to json
-						data, err := ioutil.ReadFile(filepath.Join(testTempDir, testsToRunContent.Tests[i].FileName))
+						data, err := os.ReadFile(filepath.Join(testTempDir, testsToRunContent.Tests[i].FileName))
 						if err != nil {
 							t.Errorf("  FAIL: unable to read %s: %v", testsToRunContent.Tests[i].FileName, err)
 							f.Close()

test/v200/utils/api/test_utils.go

@@ -20,7 +20,8 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
+	"os"
 	"strconv"
 	"strings"
 	"testing"
@@ -66,7 +67,7 @@ func (devfileValidator DevfileValidator) WriteAndValidate(devfile *commonUtils.T
 func (schemaFile *SchemaFile) checkWithSchema(devfile string, expectedMessage string) error {
 
 	// Read the created yaml file, ready for converison to json
-	devfileData, err := ioutil.ReadFile(devfile)
+	devfileData, err := os.ReadFile(devfile)
 	if err != nil {
 		commonUtils.LogErrorMessage(fmt.Sprintf("  FAIL: schema : unable to read %s: %v", devfile, err))
 		return err
@@ -140,7 +141,7 @@ func writeDevfile(devfile *commonUtils.TestDevfile) error {
 	if marshallErr != nil {
 		err = errors.New(commonUtils.LogErrorMessage(fmt.Sprintf("Marshall devfile %s : %v", devfile.FileName, marshallErr)))
 	} else {
-		err = ioutil.WriteFile(fileName, c, 0644)
+		err = os.WriteFile(fileName, c, 0644)
 		if err != nil {
 			commonUtils.LogErrorMessage(fmt.Sprintf("Write devfile %s : %v", devfile.FileName, err))
 		}