refactor: remove leftover ioutil from internal/httptransport

1 files changed, 11 insertions, 12 deletions

diff --git a/internal/httptransport/transport_darwin.go b/internal/httptransport/transport_darwin.go
index 46be2540..43c0b830 100644
--- a/internal/httptransport/transport_darwin.go
+++ b/internal/httptransport/transport_darwin.go
@@ -6,7 +6,6 @@
 package httptransport
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -45,7 +44,7 @@ func loadCertFile() error {
 		return nil
 	}
 
-	data, err := ioutil.ReadFile(sslCertFile)
+	data, err := os.ReadFile(sslCertFile)
 	if err != nil && !os.IsNotExist(err) {
 		return err
 	}
@@ -77,7 +76,7 @@ func loadCertDir() error {
 
 		rootsAdded := false
 		for _, fi := range fis {
-			data, err := ioutil.ReadFile(directory + "/" + fi.Name())
+			data, err := os.ReadFile(directory + "/" + fi.Name())
 			if err == nil && sysPool.AppendCertsFromPEM(data) {
 				rootsAdded = true
 			}
@@ -93,15 +92,15 @@ func loadCertDir() error {
 
 // readUniqueDirectoryEntries is like ioutil.ReadDir but omits
 // symlinks that point within the directory.
-func readUniqueDirectoryEntries(dir string) ([]os.FileInfo, error) {
-	fis, err := ioutil.ReadDir(dir)
+func readUniqueDirectoryEntries(dir string) ([]os.DirEntry, error) {
+	des, err := os.ReadDir(dir)
 	if err != nil {
 		return nil, err
 	}
-	uniq := fis[:0]
-	for _, fi := range fis {
-		if !isSameDirSymlink(fi, dir) {
-			uniq = append(uniq, fi)
+	uniq := des[:0]
+	for _, de := range fis {
+		if !isSameDirSymlink(de, dir) {
+			uniq = append(uniq, de)
 		}
 	}
 	return uniq, nil
@@ -109,10 +108,10 @@ func readUniqueDirectoryEntries(dir string) ([]os.FileInfo, error) {
 
 // isSameDirSymlink reports whether fi in dir is a symlink with a
 // target not containing a slash.
-func isSameDirSymlink(fi os.FileInfo, dir string) bool {
-	if fi.Mode()&os.ModeSymlink == 0 {
+func isSameDirSymlink(de os.DirEntry, dir string) bool {
+	if de.Mode()&os.ModeSymlink == 0 {
 		return false
 	}
-	target, err := os.Readlink(filepath.Join(dir, fi.Name()))
+	target, err := os.Readlink(filepath.Join(dir, de.Name()))
 	return err == nil && !strings.Contains(target, "/")
 }