Replace ioutil with os package functions for file operations

Author: BraisVQ

pkg/cli/options.go

@@ -3,7 +3,6 @@ package cli
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"strings"
@@ -619,7 +618,7 @@ func getFileFlags(filename string, verbose bool) (map[string]string, error) {
 		return fileFlags, err
 	}
 
-	b, err := ioutil.ReadFile(filename)
+	b, err := os.ReadFile(filename)
 	if err != nil {
 		return fileFlags, err
 	}

pkg/commands/diff.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
+	"os"
 	"regexp"
 
 	"github.com/opendevstack/tailor/pkg/cli"
@@ -198,7 +198,7 @@ func printUpdateChange(w io.Writer, change *openshift.Change, revealSecrets bool
 func assembleTemplateBasedResourceList(filter *openshift.ResourceFilter, compareOptions *cli.CompareOptions, ocClient cli.OcClientProcessor) (*openshift.ResourceList, error) {
 	var inputs [][]byte
 
-	files, err := ioutil.ReadDir(compareOptions.TemplateDir)
+	files, err := os.ReadDir(compareOptions.TemplateDir)
 	if err != nil {
 		return nil, fmt.Errorf("Cannot get files in template directory '%s': %s", compareOptions.TemplateDir, err)
 	}

pkg/commands/secrets.go

@@ -2,7 +2,6 @@ package commands
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"regexp"
 	"strings"
@@ -74,7 +73,7 @@ func ReEncrypt(secretsOptions *cli.SecretsOptions, filename string) error {
 		}
 	} else {
 		paramDir := secretsOptions.ParamDir
-		files, err := ioutil.ReadDir(paramDir)
+		files, err := os.ReadDir(paramDir)
 		if err != nil {
 			return err
 		}
@@ -171,7 +170,7 @@ func writeEncryptedContent(filename, newContent, previousContent, privateKey, pa
 		return fmt.Errorf("Could not encrypt content: %s", err)
 	}
 
-	err = ioutil.WriteFile(filename, []byte(updatedContent), 0644)
+	err = os.WriteFile(filename, []byte(updatedContent), 0644)
 	if err != nil {
 		return fmt.Errorf("Could not write file: %s", err)
 	}

pkg/openshift/params.go

@@ -3,7 +3,6 @@ package openshift
 import (
 	"encoding/base64"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"regexp"
 	"strings"
@@ -112,7 +111,7 @@ func newWriteConverter(previous, publicKeyDir, privateKey, passphrase string) (*
 
 	// Read public keys
 	cli.DebugMsg(fmt.Sprintf("Looking for public keys in '%s'", publicKeyDir))
-	files, err := ioutil.ReadDir(publicKeyDir)
+	files, err := os.ReadDir(publicKeyDir)
 	if err != nil {
 		return nil, err
 	}

pkg/openshift/params_test.go

@@ -1,7 +1,6 @@
 package openshift
 
 import (
-	"io/ioutil"
 	"strings"
 	"testing"
 )
@@ -63,7 +62,7 @@ func TestEncryptedParams(t *testing.T) {
 }
 
 func readFileContent(t *testing.T, filename string) string {
-	bytes, err := ioutil.ReadFile(filename)
+	bytes, err := os.ReadFile(filename)
 	if err != nil {
 		t.Error(err)
 	}

pkg/openshift/template.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strings"
 
@@ -48,7 +47,7 @@ func ProcessTemplate(templateDir string, name string, paramDir string, compareOp
 			return []byte{}, err
 		}
 
-		tempParamFile, err := ioutil.TempFile("", ".combined.*.env")
+		tempParamFile, err := os.CreateTemp("", ".combined.*.env")
 		if err != nil {
 			return []byte{}, err
 		}
@@ -84,7 +83,7 @@ func ProcessTemplate(templateDir string, name string, paramDir string, compareOp
 
 // Returns true if template contains a param like "name: TAILOR_NAMESPACE"
 func templateContainsTailorNamespaceParam(filename string) (bool, error) {
-	b, err := ioutil.ReadFile(filename)
+	b, err := os.ReadFile(filename)
 	if err != nil {
 		return false, fmt.Errorf("Could not read file '%s': %s", filename, err)
 	}
@@ -159,7 +158,7 @@ func readParamFileBytes(paramFiles []string, privateKey string, passphrase strin
 	paramFileBytes := []byte{}
 	for _, f := range paramFiles {
 		cli.DebugMsg("Reading content of param file", f)
-		b, err := ioutil.ReadFile(f)
+		b, err := os.ReadFile(f)
 		if err != nil {
 			return []byte{}, err
 		}
@@ -173,7 +172,7 @@ func readParamFileBytes(paramFiles []string, privateKey string, passphrase strin
 		encFile := f + ".enc"
 		if _, err := os.Stat(encFile); err == nil {
 			cli.DebugMsg("Reading content of encrypted param file", encFile)
-			b, err := ioutil.ReadFile(encFile)
+			b, err := os.ReadFile(encFile)
 			if err != nil {
 				return []byte{}, err
 			}

pkg/utils/encryption.go

@@ -6,7 +6,6 @@ import (
 	"encoding/base64"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 
 	"golang.org/x/crypto/openpgp"
@@ -136,7 +135,7 @@ func Encrypt(secret string, entityList openpgp.EntityList) (string, error) {
 	}
 
 	// Return as base64 encoded string
-	bytes, err := ioutil.ReadAll(buf)
+	bytes, err := io.ReadAll(buf)
 	if err != nil {
 		return "", err
 	}
@@ -158,6 +157,6 @@ func Decrypt(encoded string, entityList openpgp.EntityList) (string, error) {
 	if err != nil {
 		return "", fmt.Errorf("Decrypting '%s' failed: %s", encoded, err)
 	}
-	bytes, err := ioutil.ReadAll(md.UnverifiedBody)
+	bytes, err := io.ReadAll(md.UnverifiedBody)
 	return string(bytes), err
 }

pkg/utils/file.go

@@ -1,7 +1,6 @@
 package utils
 
 import (
-	"io/ioutil"
 	"os"
 )
 
@@ -21,7 +20,7 @@ func ReadFile(filename string) (string, error) {
 	if _, err := os.Stat(filename); err != nil {
 		return "", err
 	}
-	bytes, err := ioutil.ReadFile(filename)
+	bytes, err := os.ReadFile(filename)
 	if err != nil {
 		return "", err
 	}