Remove deprecated ioutil library (nginx#174)

Author: miledxz

internal/state/file_manager.go

@@ -2,7 +2,6 @@ package state
 
 import (
 	"io/fs"
-	"io/ioutil"
 	"os"
 )
 
@@ -12,8 +11,8 @@ func newStdLibFileManager() *stdLibFileManager {
 	return &stdLibFileManager{}
 }
 
-func (s *stdLibFileManager) ReadDir(dirname string) ([]fs.FileInfo, error) {
-	return ioutil.ReadDir(dirname)
+func (s *stdLibFileManager) ReadDir(dirname string) ([]fs.DirEntry, error) {
+	return os.ReadDir(dirname)
 }
 
 func (s *stdLibFileManager) Remove(name string) error {

internal/state/secrets.go

@@ -15,7 +15,7 @@ import (
 //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SecretStore
 //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SecretDiskMemoryManager
 //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . FileManager
-//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 io/fs.FileInfo
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 io/fs.DirEntry
 
 // tlsSecretFileMode defines the default file mode for files with TLS Secrets.
 const tlsSecretFileMode = 0o600
@@ -78,8 +78,8 @@ type SecretDiskMemoryManager interface {
 // FileManager is an interface that exposes File I/O operations.
 // Used for unit testing.
 type FileManager interface {
-	// ReadDir returns the file info for the directory.
-	ReadDir(dirname string) ([]fs.FileInfo, error)
+	// ReadDir returns the directory entries for the directory.
+	ReadDir(dirname string) ([]fs.DirEntry, error)
 	// Remove file with given name.
 	Remove(name string) error
 	// Create file at the provided filepath.

internal/state/secrets_test.go

@@ -4,7 +4,6 @@ package state_test
 import (
 	"errors"
 	"io/fs"
-	"io/ioutil"
 	"os"
 	"path"
 
@@ -201,7 +200,7 @@ var _ = Describe("SecretDiskMemoryManager", func() {
 			expectedFileNames := []string{"test_secret1", "test_secret2"}
 
 			// read all files from directory
-			dir, err := ioutil.ReadDir(tmpSecretsDir)
+			dir, err := os.ReadDir(tmpSecretsDir)
 			Expect(err).ToNot(HaveOccurred())
 
 			// test that the files exist that we expect
@@ -222,7 +221,7 @@ var _ = Describe("SecretDiskMemoryManager", func() {
 			Expect(err).ToNot(HaveOccurred())
 
 			// read all files from directory
-			dir, err := ioutil.ReadDir(tmpSecretsDir)
+			dir, err := os.ReadDir(tmpSecretsDir)
 			Expect(err).ToNot(HaveOccurred())
 
 			// only the secrets stored after the last write should be written to disk.
@@ -235,7 +234,7 @@ var _ = Describe("SecretDiskMemoryManager", func() {
 				Expect(err).ToNot(HaveOccurred())
 
 				// read all files from directory
-				dir, err := ioutil.ReadDir(tmpSecretsDir)
+				dir, err := os.ReadDir(tmpSecretsDir)
 				Expect(err).ToNot(HaveOccurred())
 
 				// no secrets should exist
@@ -245,16 +244,16 @@ var _ = Describe("SecretDiskMemoryManager", func() {
 	})
 	Describe("Write all requested secrets", func() {
 		var (
-			fakeFileManager   *statefakes.FakeFileManager
-			fakeStore         *statefakes.FakeSecretStore
-			fakeFileInfoSlice []fs.FileInfo
-			memMgr            *state.SecretDiskMemoryManagerImpl
+			fakeFileManager *statefakes.FakeFileManager
+			fakeStore       *statefakes.FakeSecretStore
+			fakeDirEntries  []fs.DirEntry
+			memMgr          *state.SecretDiskMemoryManagerImpl
 		)
 
 		BeforeEach(OncePerOrdered, func() {
 			fakeFileManager = &statefakes.FakeFileManager{}
 			fakeStore = &statefakes.FakeSecretStore{}
-			fakeFileInfoSlice = []fs.FileInfo{&statefakes.FakeFileInfo{}}
+			fakeDirEntries = []fs.DirEntry{&statefakes.FakeDirEntry{}}
 			memMgr = state.NewSecretDiskMemoryManager("", fakeStore, state.WithSecretFileManager(fakeFileManager))
 
 			// populate a requested secret
@@ -276,7 +275,7 @@ var _ = Describe("SecretDiskMemoryManager", func() {
 				}),
 			Entry("remove file error", errors.New("remove file"),
 				func(e error) {
-					fakeFileManager.ReadDirReturns(fakeFileInfoSlice, nil)
+					fakeFileManager.ReadDirReturns(fakeDirEntries, nil)
 					fakeFileManager.RemoveReturns(e)
 				}),
 			Entry("create file error", errors.New("create error"),