Replaced deprecated io/ioutil functions (#768)

Signed-off-by: slab713 <109306207+slab713@users.noreply.github.com>

pkg/storage/local.go

@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"io"
 	"io/fs"
-	"io/ioutil"
 	"os"
 	"path"
 	"path/filepath"
@@ -269,7 +268,7 @@ func (is *ImageStoreLocal) ValidateRepo(name string) (bool, error) {
 		return false, zerr.ErrRepoNotFound
 	}
 
-	files, err := ioutil.ReadDir(dir)
+	files, err := os.ReadDir(dir)
 	if err != nil {
 		is.log.Error().Err(err).Str("dir", dir).Msg("unable to read directory")
 
@@ -300,7 +299,7 @@ func (is *ImageStoreLocal) ValidateRepo(name string) (bool, error) {
 		}
 	}
 
-	buf, err := ioutil.ReadFile(path.Join(dir, ispec.ImageLayoutFile))
+	buf, err := os.ReadFile(path.Join(dir, ispec.ImageLayoutFile))
 	if err != nil {
 		return false, err
 	}
@@ -326,7 +325,7 @@ func (is *ImageStoreLocal) GetRepositories() ([]string, error) {
 	is.RLock(&lockLatency)
 	defer is.RUnlock(&lockLatency)
 
-	_, err := ioutil.ReadDir(dir)
+	_, err := os.ReadDir(dir)
 	if err != nil {
 		is.log.Error().Err(err).Msg("failure walking storage root-dir")
 
@@ -373,7 +372,7 @@ func (is *ImageStoreLocal) GetImageTags(repo string) ([]string, error) {
 	is.RLock(&lockLatency)
 	defer is.RUnlock(&lockLatency)
 
-	buf, err := ioutil.ReadFile(path.Join(dir, "index.json"))
+	buf, err := os.ReadFile(path.Join(dir, "index.json"))
 	if err != nil {
 		is.log.Error().Err(err).Str("dir", dir).Msg("failed to read index.json")
 
@@ -411,7 +410,7 @@ func (is *ImageStoreLocal) GetImageManifest(repo, reference string) ([]byte, str
 	is.RLock(&lockLatency)
 	defer is.RUnlock(&lockLatency)
 
-	buf, err := ioutil.ReadFile(path.Join(dir, "index.json"))
+	buf, err := os.ReadFile(path.Join(dir, "index.json"))
 	if err != nil {
 		is.log.Error().Err(err).Str("dir", dir).Msg("failed to read index.json")
 
@@ -460,7 +459,7 @@ func (is *ImageStoreLocal) GetImageManifest(repo, reference string) ([]byte, str
 
 	p := path.Join(dir, "blobs", digest.Algorithm().String(), digest.Encoded())
 
-	buf, err = ioutil.ReadFile(p)
+	buf, err = os.ReadFile(p)
 
 	if err != nil {
 		is.log.Error().Err(err).Str("blob", p).Msg("failed to read manifest")
@@ -538,7 +537,8 @@ func (is *ImageStoreLocal) validateOCIManifest(repo, reference string, manifest
 	return "", nil
 }
 
-/**
+/*
+*
 before an image index manifest is pushed to a repo, its constituent manifests
 are pushed first, so when updating/removing this image index manifest, we also
 need to determine if there are other image index manifests which refer to the
@@ -551,7 +551,7 @@ func pruneImageManifestsFromIndex(dir string, digest godigest.Digest, // nolint:
 ) ([]ispec.Descriptor, error) {
 	indexPath := path.Join(dir, "blobs", digest.Algorithm().String(), digest.Encoded())
 
-	buf, err := ioutil.ReadFile(indexPath)
+	buf, err := os.ReadFile(indexPath)
 	if err != nil {
 		log.Error().Err(err).Str("dir", dir).Msg("failed to read index.json")
 
@@ -574,7 +574,7 @@ func pruneImageManifestsFromIndex(dir string, digest godigest.Digest, // nolint:
 	for _, otherIndex := range otherImgIndexes {
 		indexPath := path.Join(dir, "blobs", otherIndex.Digest.Algorithm().String(), otherIndex.Digest.Encoded())
 
-		buf, err := ioutil.ReadFile(indexPath)
+		buf, err := os.ReadFile(indexPath)
 		if err != nil {
 			log.Error().Err(err).Str("dir", dir).Msg("failed to read index.json")
 
@@ -683,7 +683,7 @@ func (is *ImageStoreLocal) PutImageManifest(repo, reference, mediaType string, /
 
 	dir := path.Join(is.rootDir, repo)
 
-	buf, err := ioutil.ReadFile(path.Join(dir, "index.json"))
+	buf, err := os.ReadFile(path.Join(dir, "index.json"))
 	if err != nil {
 		is.log.Error().Err(err).Str("dir", dir).Msg("failed to read index.json")
 
@@ -874,7 +874,7 @@ func (is *ImageStoreLocal) DeleteImageManifest(repo, reference string) error {
 	is.Lock(&lockLatency)
 	defer is.Unlock(&lockLatency)
 
-	buf, err := ioutil.ReadFile(path.Join(dir, "index.json"))
+	buf, err := os.ReadFile(path.Join(dir, "index.json"))
 	if err != nil {
 		is.log.Error().Err(err).Str("dir", dir).Msg("failed to read index.json")
 
@@ -1572,7 +1572,7 @@ func (is *ImageStoreLocal) GetIndexContent(repo string) ([]byte, error) {
 	is.RLock(&lockLatency)
 	defer is.RUnlock(&lockLatency)
 
-	buf, err := ioutil.ReadFile(path.Join(dir, "index.json"))
+	buf, err := os.ReadFile(path.Join(dir, "index.json"))
 	if err != nil {
 		if os.IsNotExist(err) {
 			is.log.Error().Err(err).Str("dir", dir).Msg("index.json doesn't exist")
@@ -1646,7 +1646,7 @@ func (is *ImageStoreLocal) GetReferrers(repo, digest, artifactType string) ([]ar
 	is.RLock(&lockLatency)
 	defer is.RUnlock(&lockLatency)
 
-	buf, err := ioutil.ReadFile(path.Join(dir, "index.json"))
+	buf, err := os.ReadFile(path.Join(dir, "index.json"))
 	if err != nil {
 		is.log.Error().Err(err).Str("dir", dir).Msg("failed to read index.json")
 
@@ -1675,7 +1675,7 @@ func (is *ImageStoreLocal) GetReferrers(repo, digest, artifactType string) ([]ar
 
 		p := path.Join(dir, "blobs", manifest.Digest.Algorithm().String(), manifest.Digest.Encoded())
 
-		buf, err = ioutil.ReadFile(p)
+		buf, err = os.ReadFile(p)
 
 		if err != nil {
 			is.log.Error().Err(err).Str("blob", p).Msg("failed to read manifest")
@@ -1718,7 +1718,7 @@ func (is *ImageStoreLocal) GetReferrers(repo, digest, artifactType string) ([]ar
 
 func (is *ImageStoreLocal) writeFile(filename string, data []byte) error {
 	if !is.commit {
-		return ioutil.WriteFile(filename, data, DefaultFilePerms)
+		return os.WriteFile(filename, data, DefaultFilePerms)
 	}
 
 	fhandle, err := os.OpenFile(filename, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, DefaultFilePerms)
@@ -1753,7 +1753,7 @@ func ValidateHardLink(rootDir string) error {
 		return err
 	}
 
-	err := ioutil.WriteFile(path.Join(rootDir, "hardlinkcheck.txt"),
+	err := os.WriteFile(path.Join(rootDir, "hardlinkcheck.txt"),
 		[]byte("check whether hardlinks work on filesystem"), DefaultFilePerms)
 	if err != nil {
 		return err

pkg/storage/local_elevated_test.go

@@ -6,7 +6,6 @@ package storage_test
 import (
 	"bytes"
 	_ "crypto/sha256"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path"
@@ -57,7 +56,7 @@ func TestElevatedPrivilegesInvalidDedupe(t *testing.T) {
 			panic(err)
 		}
 
-		err = ioutil.WriteFile(path.Join(dir, "dedupe2", "blobs/sha256", blobDigest1), content, 0o755) // nolint: gosec
+		err = os.WriteFile(path.Join(dir, "dedupe2", "blobs/sha256", blobDigest1), content, 0o755) // nolint: gosec
 		if err != nil {
 			panic(err)
 		}

pkg/storage/local_test.go

@@ -9,7 +9,6 @@ import (
 	"fmt"
 	"io"
 	"io/fs"
-	"io/ioutil"
 	"math/big"
 	"os"
 	"path"
@@ -181,7 +180,7 @@ func TestGetReferrers(t *testing.T) {
 		digest := godigest.FromBytes(body)
 		buf := bytes.NewBuffer(body)
 		buflen := buf.Len()
-		err = ioutil.WriteFile(path.Join(imgStore.RootDir(), //nolint: gosec
+		err = os.WriteFile(path.Join(imgStore.RootDir(), //nolint: gosec
 			"zot-test", "blobs", digest.Algorithm().String(), digest.Encoded()),
 			buf.Bytes(), 0o644)
 		So(err, ShouldBeNil)
@@ -871,7 +870,7 @@ func FuzzGetReferrers(f *testing.F) {
 		digest := godigest.FromBytes([]byte(data))
 		buf := bytes.NewBuffer([]byte(data))
 		buflen := buf.Len()
-		err = ioutil.WriteFile(path.Join(imgStore.RootDir(), //nolint: gosec
+		err = os.WriteFile(path.Join(imgStore.RootDir(), //nolint: gosec
 			"zot-test", "blobs", digest.Algorithm().String(), digest.Encoded()),
 			buf.Bytes(), 0o644)
 		if err != nil {
@@ -1119,7 +1118,7 @@ func TestNegativeCases(t *testing.T) {
 		}
 
 		// Init repo should fail if repo is a file.
-		err = ioutil.WriteFile(path.Join(dir, "file-test"), []byte("this is test file"), 0o755) // nolint:gosec
+		err = os.WriteFile(path.Join(dir, "file-test"), []byte("this is test file"), 0o755) // nolint:gosec
 		So(err, ShouldBeNil)
 		err = imgStore.InitRepo("file-test")
 		So(err, ShouldNotBeNil)
@@ -1162,17 +1161,17 @@ func TestNegativeCases(t *testing.T) {
 			panic(err)
 		}
 
-		err = ioutil.WriteFile(path.Join(dir, "invalid-test", "blobs"), []byte{}, 0o755) // nolint: gosec
+		err = os.WriteFile(path.Join(dir, "invalid-test", "blobs"), []byte{}, 0o755) // nolint: gosec
 		if err != nil {
 			panic(err)
 		}
 
-		err = ioutil.WriteFile(path.Join(dir, "invalid-test", "index.json"), []byte{}, 0o755) // nolint: gosec
+		err = os.WriteFile(path.Join(dir, "invalid-test", "index.json"), []byte{}, 0o755) // nolint: gosec
 		if err != nil {
 			panic(err)
 		}
 
-		err = ioutil.WriteFile(path.Join(dir, "invalid-test", ispec.ImageLayoutFile), []byte{}, 0o755) // nolint: gosec
+		err = os.WriteFile(path.Join(dir, "invalid-test", ispec.ImageLayoutFile), []byte{}, 0o755) // nolint: gosec
 		if err != nil {
 			panic(err)
 		}
@@ -1193,7 +1192,7 @@ func TestNegativeCases(t *testing.T) {
 		So(err, ShouldNotBeNil)
 		So(isValid, ShouldEqual, false)
 
-		err = ioutil.WriteFile(path.Join(dir, "invalid-test", ispec.ImageLayoutFile), []byte("{}"), 0o755) // nolint: gosec
+		err = os.WriteFile(path.Join(dir, "invalid-test", ispec.ImageLayoutFile), []byte("{}"), 0o755) // nolint: gosec
 		if err != nil {
 			panic(err)
 		}
@@ -1203,7 +1202,7 @@ func TestNegativeCases(t *testing.T) {
 		So(err, ShouldEqual, zerr.ErrRepoBadVersion)
 		So(isValid, ShouldEqual, false)
 
-		files, err := ioutil.ReadDir(path.Join(dir, "test"))
+		files, err := os.ReadDir(path.Join(dir, "test"))
 		if err != nil {
 			panic(err)
 		}
@@ -1265,7 +1264,7 @@ func TestNegativeCases(t *testing.T) {
 		So(err, ShouldNotBeNil)
 		So(os.RemoveAll(path.Join(dir, "test")), ShouldBeNil)
 		So(imgStore.InitRepo("test"), ShouldBeNil)
-		So(ioutil.WriteFile(path.Join(dir, "test", "index.json"), []byte{}, 0o600), ShouldBeNil)
+		So(os.WriteFile(path.Join(dir, "test", "index.json"), []byte{}, 0o600), ShouldBeNil)
 		_, err = imgStore.GetImageTags("test")
 		So(err, ShouldNotBeNil)
 	})
@@ -1308,7 +1307,7 @@ func TestNegativeCases(t *testing.T) {
 
 		So(imgStore.InitRepo("test"), ShouldBeNil)
 
-		err = ioutil.WriteFile(path.Join(dir, "test", "index.json"), []byte{}, 0o600)
+		err = os.WriteFile(path.Join(dir, "test", "index.json"), []byte{}, 0o600)
 		if err != nil {
 			panic(err)
 		}
@@ -1385,7 +1384,7 @@ func TestNegativeCases(t *testing.T) {
 		dir := t.TempDir()
 
 		filePath := path.Join(dir, "file.txt")
-		err := ioutil.WriteFile(filePath, []byte("some dummy file content"), 0o644) //nolint: gosec
+		err := os.WriteFile(filePath, []byte("some dummy file content"), 0o644) //nolint: gosec
 		if err != nil {
 			panic(err)
 		}
@@ -1440,7 +1439,7 @@ func TestHardLink(t *testing.T) {
 		dir := t.TempDir()
 
 		filePath := path.Join(dir, "file.txt")
-		err := ioutil.WriteFile(filePath, []byte("some dummy file content"), 0o644) //nolint: gosec
+		err := os.WriteFile(filePath, []byte("some dummy file content"), 0o644) //nolint: gosec
 		if err != nil {
 			panic(err)
 		}
@@ -1454,7 +1453,7 @@ func TestHardLink(t *testing.T) {
 		err := storage.ValidateHardLink(dir)
 		So(err, ShouldBeNil)
 
-		err = ioutil.WriteFile(path.Join(dir, "hardtest.txt"), []byte("testing hard link code"), 0o644) //nolint: gosec
+		err = os.WriteFile(path.Join(dir, "hardtest.txt"), []byte("testing hard link code"), 0o644) //nolint: gosec
 		if err != nil {
 			panic(err)
 		}
@@ -1895,7 +1894,7 @@ func TestGarbageCollectForImageStore(t *testing.T) {
 		dir := t.TempDir()
 
 		Convey("Garbage collect error for repo with config removed", func() {
-			logFile, _ := ioutil.TempFile("", "zot-log*.txt")
+			logFile, _ := os.CreateTemp("", "zot-log*.txt")
 
 			defer os.Remove(logFile.Name()) // clean up
 
@@ -1927,7 +1926,7 @@ func TestGarbageCollectForImageStore(t *testing.T) {
 		})
 
 		Convey("Garbage collect error - not enough permissions to access index.json", func() {
-			logFile, _ := ioutil.TempFile("", "zot-log*.txt")
+			logFile, _ := os.CreateTemp("", "zot-log*.txt")
 
 			defer os.Remove(logFile.Name()) // clean up
 
@@ -2020,7 +2019,7 @@ func TestGetRepositoriesError(t *testing.T) {
 		err := os.Mkdir(path.Join(dir, "test-dir"), 0o755)
 		So(err, ShouldBeNil)
 
-		err = ioutil.WriteFile(path.Join(dir, "test-dir/test-file"), []byte("this is test file"), 0o000)
+		err = os.WriteFile(path.Join(dir, "test-dir/test-file"), []byte("this is test file"), 0o000)
 		So(err, ShouldBeNil)
 
 		_, err = imgStore.GetRepositories()

pkg/storage/s3/s3_test.go

@@ -8,7 +8,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path"
 	"strings"
@@ -217,7 +216,7 @@ func (s *StorageDriverMock) Reader(ctx context.Context, path string, offset int6
 		return s.ReaderFn(ctx, path, offset)
 	}
 
-	return ioutil.NopCloser(strings.NewReader("")), nil
+	return io.NopCloser(strings.NewReader("")), nil
 }
 
 func (s *StorageDriverMock) Writer(ctx context.Context, path string, isAppend bool) (driver.FileWriter, error) {
@@ -477,7 +476,7 @@ func TestNegativeCasesObjectsStorage(t *testing.T) {
 				return &FileWriterMock{}, errS3
 			},
 			ReaderFn: func(ctx context.Context, path string, offset int64) (io.ReadCloser, error) {
-				return ioutil.NopCloser(strings.NewReader("")), errS3
+				return io.NopCloser(strings.NewReader("")), errS3
 			},
 			WalkFn: func(ctx context.Context, path string, f driver.WalkFn) error {
 				return errS3
@@ -655,7 +654,7 @@ func TestNegativeCasesObjectsStorage(t *testing.T) {
 				return &FileWriterMock{}, errS3
 			},
 		})
-		_, err := imgStore.PutBlobChunkStreamed(testImage, "uuid", ioutil.NopCloser(strings.NewReader("")))
+		_, err := imgStore.PutBlobChunkStreamed(testImage, "uuid", io.NopCloser(strings.NewReader("")))
 		So(err, ShouldNotBeNil)
 	})
 
@@ -667,7 +666,7 @@ func TestNegativeCasesObjectsStorage(t *testing.T) {
 				}}, nil
 			},
 		})
-		_, err := imgStore.PutBlobChunkStreamed(testImage, "uuid", ioutil.NopCloser(strings.NewReader("")))
+		_, err := imgStore.PutBlobChunkStreamed(testImage, "uuid", io.NopCloser(strings.NewReader("")))
 		So(err, ShouldNotBeNil)
 	})
 
@@ -677,7 +676,7 @@ func TestNegativeCasesObjectsStorage(t *testing.T) {
 				return &FileWriterMock{}, errS3
 			},
 		})
-		_, err := imgStore.PutBlobChunk(testImage, "uuid", 0, 100, ioutil.NopCloser(strings.NewReader("")))
+		_, err := imgStore.PutBlobChunk(testImage, "uuid", 0, 100, io.NopCloser(strings.NewReader("")))
 		So(err, ShouldNotBeNil)
 	})
 
@@ -694,7 +693,7 @@ func TestNegativeCasesObjectsStorage(t *testing.T) {
 				}, nil
 			},
 		})
-		_, err := imgStore.PutBlobChunk(testImage, "uuid", 0, 100, ioutil.NopCloser(strings.NewReader("")))
+		_, err := imgStore.PutBlobChunk(testImage, "uuid", 0, 100, io.NopCloser(strings.NewReader("")))
 		So(err, ShouldNotBeNil)
 	})
 
@@ -708,7 +707,7 @@ func TestNegativeCasesObjectsStorage(t *testing.T) {
 				}, nil
 			},
 		})
-		_, err := imgStore.PutBlobChunk(testImage, "uuid", 12, 100, ioutil.NopCloser(strings.NewReader("")))
+		_, err := imgStore.PutBlobChunk(testImage, "uuid", 12, 100, io.NopCloser(strings.NewReader("")))
 		So(err, ShouldNotBeNil)
 	})
 
@@ -723,7 +722,7 @@ func TestNegativeCasesObjectsStorage(t *testing.T) {
 			},
 		})
 		d := godigest.FromBytes([]byte("test"))
-		err := imgStore.FinishBlobUpload(testImage, "uuid", ioutil.NopCloser(strings.NewReader("")), d.String())
+		err := imgStore.FinishBlobUpload(testImage, "uuid", io.NopCloser(strings.NewReader("")), d.String())
 		So(err, ShouldNotBeNil)
 	})
 
@@ -738,7 +737,7 @@ func TestNegativeCasesObjectsStorage(t *testing.T) {
 			},
 		})
 		d := godigest.FromBytes([]byte("test"))
-		err := imgStore.FinishBlobUpload(testImage, "uuid", ioutil.NopCloser(strings.NewReader("")), d.String())
+		err := imgStore.FinishBlobUpload(testImage, "uuid", io.NopCloser(strings.NewReader("")), d.String())
 		So(err, ShouldNotBeNil)
 	})
 
@@ -749,7 +748,7 @@ func TestNegativeCasesObjectsStorage(t *testing.T) {
 			},
 		})
 		d := godigest.FromBytes([]byte("test"))
-		err := imgStore.FinishBlobUpload(testImage, "uuid", ioutil.NopCloser(strings.NewReader("")), d.String())
+		err := imgStore.FinishBlobUpload(testImage, "uuid", io.NopCloser(strings.NewReader("")), d.String())
 		So(err, ShouldNotBeNil)
 	})
 
@@ -760,7 +759,7 @@ func TestNegativeCasesObjectsStorage(t *testing.T) {
 			},
 		})
 		d := godigest.FromBytes([]byte(""))
-		err := imgStore.FinishBlobUpload(testImage, "uuid", ioutil.NopCloser(strings.NewReader("")), d.String())
+		err := imgStore.FinishBlobUpload(testImage, "uuid", io.NopCloser(strings.NewReader("")), d.String())
 		So(err, ShouldNotBeNil)
 	})
 
@@ -771,14 +770,14 @@ func TestNegativeCasesObjectsStorage(t *testing.T) {
 			},
 		})
 		d := godigest.FromBytes([]byte(""))
-		_, _, err := imgStore.FullBlobUpload(testImage, ioutil.NopCloser(strings.NewReader("")), d.String())
+		_, _, err := imgStore.FullBlobUpload(testImage, io.NopCloser(strings.NewReader("")), d.String())
 		So(err, ShouldNotBeNil)
 	})
 
 	Convey("Test FullBlobUpload2", t, func(c C) {
 		imgStore = createMockStorage(testDir, tdir, false, &StorageDriverMock{})
 		d := godigest.FromBytes([]byte(" "))
-		_, _, err := imgStore.FullBlobUpload(testImage, ioutil.NopCloser(strings.NewReader("")), d.String())
+		_, _, err := imgStore.FullBlobUpload(testImage, io.NopCloser(strings.NewReader("")), d.String())
 		So(err, ShouldNotBeNil)
 	})
 
@@ -789,14 +788,14 @@ func TestNegativeCasesObjectsStorage(t *testing.T) {
 			},
 		})
 		d := godigest.FromBytes([]byte(""))
-		_, _, err := imgStore.FullBlobUpload(testImage, ioutil.NopCloser(strings.NewReader("")), d.String())
+		_, _, err := imgStore.FullBlobUpload(testImage, io.NopCloser(strings.NewReader("")), d.String())
 		So(err, ShouldNotBeNil)
 	})
 
 	Convey("Test GetBlob", t, func(c C) {
 		imgStore = createMockStorage(testDir, tdir, false, &StorageDriverMock{
 			ReaderFn: func(ctx context.Context, path string, offset int64) (io.ReadCloser, error) {
-				return ioutil.NopCloser(strings.NewReader("")), errS3
+				return io.NopCloser(strings.NewReader("")), errS3
 			},
 		})
 		d := godigest.FromBytes([]byte(""))
@@ -1010,12 +1009,12 @@ func TestS3Dedupe(t *testing.T) {
 		Convey("Check backward compatibility - switch dedupe to false", func() {
 			/* copy cache to the new storage with dedupe false (doing this because we
 			already have a cache object holding the lock on cache db file) */
-			input, err := ioutil.ReadFile(path.Join(tdir, s3.CacheDBName+storage.DBExtensionName))
+			input, err := os.ReadFile(path.Join(tdir, s3.CacheDBName+storage.DBExtensionName))
 			So(err, ShouldBeNil)
 
 			tdir = t.TempDir()
 
-			err = ioutil.WriteFile(path.Join(tdir, s3.CacheDBName+storage.DBExtensionName), input, 0o600)
+			err = os.WriteFile(path.Join(tdir, s3.CacheDBName+storage.DBExtensionName), input, 0o600)
 			So(err, ShouldBeNil)
 
 			storeDriver, imgStore, _ := createObjectsStore(testDir, tdir, false)
@@ -1747,12 +1746,12 @@ func TestS3DedupeErr(t *testing.T) {
 		So(err, ShouldBeNil)
 
 		// copy cache db to the new imagestore
-		input, err := ioutil.ReadFile(path.Join(tdir, s3.CacheDBName+storage.DBExtensionName))
+		input, err := os.ReadFile(path.Join(tdir, s3.CacheDBName+storage.DBExtensionName))
 		So(err, ShouldBeNil)
 
 		tdir = t.TempDir()
 
-		err = ioutil.WriteFile(path.Join(tdir, s3.CacheDBName+storage.DBExtensionName), input, 0o600)
+		err = os.WriteFile(path.Join(tdir, s3.CacheDBName+storage.DBExtensionName), input, 0o600)
 		So(err, ShouldBeNil)
 
 		imgStore = createMockStorage(testDir, tdir, true, &StorageDriverMock{
@@ -1784,12 +1783,12 @@ func TestS3DedupeErr(t *testing.T) {
 		So(err, ShouldBeNil)
 
 		// copy cache db to the new imagestore
-		input, err := ioutil.ReadFile(path.Join(tdir, s3.CacheDBName+storage.DBExtensionName))
+		input, err := os.ReadFile(path.Join(tdir, s3.CacheDBName+storage.DBExtensionName))
 		So(err, ShouldBeNil)
 
 		tdir = t.TempDir()
 
-		err = ioutil.WriteFile(path.Join(tdir, s3.CacheDBName+storage.DBExtensionName), input, 0o600)
+		err = os.WriteFile(path.Join(tdir, s3.CacheDBName+storage.DBExtensionName), input, 0o600)
 		So(err, ShouldBeNil)
 
 		imgStore = createMockStorage(testDir, tdir, true, &StorageDriverMock{
@@ -1802,10 +1801,10 @@ func TestS3DedupeErr(t *testing.T) {
 			},
 			ReaderFn: func(ctx context.Context, path string, offset int64) (io.ReadCloser, error) {
 				if strings.Contains(path, "repo1/dst1") {
-					return ioutil.NopCloser(strings.NewReader("")), errS3
+					return io.NopCloser(strings.NewReader("")), errS3
 				}
 
-				return ioutil.NopCloser(strings.NewReader("")), nil
+				return io.NopCloser(strings.NewReader("")), nil
 			},
 		})
 
@@ -1856,7 +1855,7 @@ func TestS3DedupeErr(t *testing.T) {
 			},
 		})
 		d := godigest.FromBytes([]byte(""))
-		_, _, err := imgStore.FullBlobUpload(testImage, ioutil.NopCloser(strings.NewReader("")), d.String())
+		_, _, err := imgStore.FullBlobUpload(testImage, io.NopCloser(strings.NewReader("")), d.String())
 		So(err, ShouldNotBeNil)
 	})
 
@@ -1868,7 +1867,7 @@ func TestS3DedupeErr(t *testing.T) {
 			},
 		})
 		d := godigest.FromBytes([]byte(""))
-		err := imgStore.FinishBlobUpload(testImage, "uuid", ioutil.NopCloser(strings.NewReader("")), d.String())
+		err := imgStore.FinishBlobUpload(testImage, "uuid", io.NopCloser(strings.NewReader("")), d.String())
 		So(err, ShouldNotBeNil)
 	})
 }

pkg/storage/scrub.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path"
 	"strings"
@@ -105,7 +104,7 @@ func CheckRepo(imageName string, imgStore ImageStore) ([]ScrubImageResult, error
 	imgStore.RLock(&lockLatency)
 	defer imgStore.RUnlock(&lockLatency)
 
-	buf, err := ioutil.ReadFile(path.Join(dir, "index.json"))
+	buf, err := os.ReadFile(path.Join(dir, "index.json"))
 	if err != nil {
 		return results, err
 	}

pkg/storage/scrub_test.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path"
 	"regexp"
@@ -164,7 +163,7 @@ func TestCheckAllBlobsIntegrity(t *testing.T) {
 			So(actual, ShouldContainSubstring, "test 1.0 affected parse application/vnd.oci.image.manifest.v1+json")
 
 			// put manifest content back to file
-			err = ioutil.WriteFile(manifestFile, content, 0o600)
+			err = os.WriteFile(manifestFile, content, 0o600)
 			So(err, ShouldBeNil)
 		})
 
@@ -192,7 +191,7 @@ func TestCheckAllBlobsIntegrity(t *testing.T) {
 			So(actual, ShouldContainSubstring, "test 1.0 affected stat: parse application/vnd.oci.image.config.v1+json")
 
 			// put config content back to file
-			err = ioutil.WriteFile(configFile, content, 0o600)
+			err = os.WriteFile(configFile, content, 0o600)
 			So(err, ShouldBeNil)
 		})
 
@@ -220,7 +219,7 @@ func TestCheckAllBlobsIntegrity(t *testing.T) {
 			So(actual, ShouldContainSubstring, "test 1.0 affected blob: bad blob digest")
 
 			// put layer content back to file
-			err = ioutil.WriteFile(layerFile, content, 0o600)
+			err = os.WriteFile(layerFile, content, 0o600)
 			So(err, ShouldBeNil)
 		})