Remove deprecated functions

closure/file.go

@@ -2,7 +2,7 @@ package closure
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"os"
 )
 
 type Storepath struct {
@@ -11,7 +11,7 @@ type Storepath struct {
 }
 
 func ReadClosureGraphFile(filename string) (storepaths []Storepath, err error) {
-	content, err := ioutil.ReadFile(filename)
+	content, err := os.ReadFile(filename)
 	if err != nil {
 		return
 	}

cmd/image.go

@@ -3,7 +3,6 @@ package cmd
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"runtime"
 
@@ -51,7 +50,7 @@ func imageFromDir(outputFilename, directory string) error {
 	if err != nil {
 		return err
 	}
-	err = ioutil.WriteFile(outputFilename, []byte(res), 0666)
+	err = os.WriteFile(outputFilename, []byte(res), 0666)
 	if err != nil {
 		return err
 	}
@@ -64,7 +63,7 @@ func image(outputFilename, imageConfigPath string, fromImageFilename string, lay
 	var image types.Image
 
 	logrus.Infof("Getting image configuration from %s", imageConfigPath)
-	imageConfigJson, err := ioutil.ReadFile(imageConfigPath)
+	imageConfigJson, err := os.ReadFile(imageConfigPath)
 	if err != nil {
 		return err
 	}
@@ -88,7 +87,7 @@ func image(outputFilename, imageConfigPath string, fromImageFilename string, lay
 	image.ImageConfig = imageConfig
 	for _, path := range layerPaths {
 		var layers []types.Layer
-		layerJson, err := ioutil.ReadFile(path)
+		layerJson, err := os.ReadFile(path)
 		if err != nil {
 			return err
 		}
@@ -103,7 +102,7 @@ func image(outputFilename, imageConfigPath string, fromImageFilename string, lay
 	if err != nil {
 		return err
 	}
-	err = ioutil.WriteFile(outputFilename, []byte(res), 0666)
+	err = os.WriteFile(outputFilename, []byte(res), 0666)
 	if err != nil {
 		return err
 	}

cmd/layers.go

@@ -10,7 +10,6 @@ import (
 	_ "crypto/sha512"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 
 	"github.com/nlewo/nix2container/closure"
@@ -131,7 +130,7 @@ func layersToJson(outputFilename string, layers []types.Layer) error {
 	if err != nil {
 		return err
 	}
-	err = ioutil.WriteFile(outputFilename, []byte(res), 0666)
+	err = os.WriteFile(outputFilename, []byte(res), 0666)
 	if err != nil {
 		return err
 	}

cmd/utils.go

@@ -2,13 +2,13 @@ package cmd
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"os"
 
 	"github.com/nlewo/nix2container/types"
 )
 
 func readPermsFile(filename string) (permPaths []types.PermPath, err error) {
-	content, err := ioutil.ReadFile(filename)
+	content, err := os.ReadFile(filename)
 	if err != nil {
 		return permPaths, err
 	}
@@ -20,7 +20,7 @@ func readPermsFile(filename string) (permPaths []types.PermPath, err error) {
 }
 
 func readRewritesFile(filename string) (rewritePaths []types.RewritePath, err error) {
-	content, err := ioutil.ReadFile(filename)
+	content, err := os.ReadFile(filename)
 	if err != nil {
 		return rewritePaths, err
 	}

nix/image.go

@@ -15,7 +15,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 
 	"github.com/containers/image/v5/manifest"
@@ -105,7 +104,7 @@ func NewImageFromFile(filename string) (image types.Image, err error) {
 		return image, err
 	}
 	defer file.Close()
-	content, err := ioutil.ReadAll(file)
+	content, err := io.ReadAll(file)
 	if err != nil {
 		return image, err
 	}
@@ -125,7 +124,7 @@ func NewImageFromDir(directory string) (image types.Image, err error) {
 		return image, err
 	}
 	defer manifestFile.Close()
-	content, err := ioutil.ReadAll(manifestFile)
+	content, err := io.ReadAll(manifestFile)
 	if err != nil {
 		return image, err
 	}
@@ -135,7 +134,7 @@ func NewImageFromDir(directory string) (image types.Image, err error) {
 		return image, err
 	}
 
-	content, err = ioutil.ReadFile(directory + "/" + v1Manifest.Config.Digest.Encoded())
+	content, err = os.ReadFile(directory + "/" + v1Manifest.Config.Digest.Encoded())
 	if err != nil {
 		return image, err
 	}

nix/tar.go

@@ -4,7 +4,6 @@ import (
 	"archive/tar"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -16,7 +15,7 @@ import (
 )
 
 func TarPathsWrite(paths types.Paths, destinationDirectory string) (string, digest.Digest, int64, error) {
-	f, err := ioutil.TempFile(destinationDirectory, "")
+	f, err := os.CreateTemp(destinationDirectory, "")
 	if err != nil {
 		return "", "", 0, err
 	}

types/types.go

@@ -2,7 +2,7 @@ package types
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"os"
 
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"
@@ -82,7 +82,7 @@ func NewLayersFromFile(filename string) ([]Layer, error) {
 		return nil, err
 	}
 	defer file.Close()
-	content, err := ioutil.ReadAll(file)
+	content, err := io.ReadAll(file)
 	if err != nil {
 		return nil, err
 	}