From 04cd52b9aa27149231b2f17bd0f9e91abbb32363 Mon Sep 17 00:00:00 2001
From: Marco Franssen <marco.franssen@gmail.com>
Date: Tue, 20 Apr 2021 20:00:33 +0200
Subject: [PATCH] Replace all calls to ioutil.ReadDir

https://golang.org/doc/go1.16\#ioutil
Signed-off-by: Marco Franssen <marco.franssen@gmail.com>
---
 cmd/helm/search_repo.go           | 3 +--
 internal/third_party/dep/fs/fs.go | 3 +--
 pkg/action/lint.go                | 3 +--
 pkg/downloader/manager.go         | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/cmd/helm/search_repo.go b/cmd/helm/search_repo.go
index 1d8b04f3f..973ae531c 100644
--- a/cmd/helm/search_repo.go
+++ b/cmd/helm/search_repo.go
@@ -21,7 +21,6 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -341,7 +340,7 @@ func compListCharts(toComplete string, includeFiles bool) ([]string, cobra.Shell
 	//    listing the entire content of the current directory which will
 	//    be too many choices for the user to find the real repos)
 	if includeFiles && len(completions) > 0 && len(toComplete) > 0 {
-		if files, err := ioutil.ReadDir("."); err == nil {
+		if files, err := os.ReadDir("."); err == nil {
 			for _, file := range files {
 				if strings.HasPrefix(file.Name(), toComplete) {
 					// We are completing a file prefix
diff --git a/internal/third_party/dep/fs/fs.go b/internal/third_party/dep/fs/fs.go
index 832592197..4e4eacc60 100644
--- a/internal/third_party/dep/fs/fs.go
+++ b/internal/third_party/dep/fs/fs.go
@@ -33,7 +33,6 @@ package fs
 
 import (
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -119,7 +118,7 @@ func CopyDir(src, dst string) error {
 		return errors.Wrapf(err, "cannot mkdir %s", dst)
 	}
 
-	entries, err := ioutil.ReadDir(src)
+	entries, err := os.ReadDir(src)
 	if err != nil {
 		return errors.Wrapf(err, "cannot read directory %s", dst)
 	}
diff --git a/pkg/action/lint.go b/pkg/action/lint.go
index 46095de26..4fcec1e32 100644
--- a/pkg/action/lint.go
+++ b/pkg/action/lint.go
@@ -17,7 +17,6 @@ limitations under the License.
 package action
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -96,7 +95,7 @@ func lintChart(path string, vals map[string]interface{}, namespace string, stric
 			return linter, errors.Wrap(err, "unable to extract tarball")
 		}
 
-		files, err := ioutil.ReadDir(tempDir)
+		files, err := os.ReadDir(tempDir)
 		if err != nil {
 			return linter, errors.Wrapf(err, "unable to read temporary output directory %s", tempDir)
 		}
diff --git a/pkg/downloader/manager.go b/pkg/downloader/manager.go
index 219579c09..6b720b351 100644
--- a/pkg/downloader/manager.go
+++ b/pkg/downloader/manager.go
@@ -20,7 +20,6 @@ import (
 	"encoding/hex"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"net/url"
 	"os"
@@ -862,7 +861,7 @@ func tarFromLocalDir(chartpath, name, repo, version string) (string, error) {
 
 // move files from tmppath to destpath
 func move(tmpPath, destPath string) error {
-	files, _ := ioutil.ReadDir(tmpPath)
+	files, _ := os.ReadDir(tmpPath)
 	for _, file := range files {
 		filename := file.Name()
 		tmpfile := filepath.Join(tmpPath, filename)