replaced deprecated ioutil

carapace-sh · Apr 26, 2022 · ae981bf · ae981bf
1 parent 71e4cb7
commit ae981bf
Show file tree

Hide file tree

Showing 25 changed files with 51 additions and 66 deletions.
diff --git a/cmd/generate/gen.go b/cmd/generate/gen.go
@@ -2,7 +2,6 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -74,8 +73,8 @@ func executeCompleter(completer string) {
 		os.Exit(1)
 	}
 
-	ioutil.WriteFile(root+"/cmd/carapace/cmd/completers.go", []byte("//go:build !release\n\n"+content), 0644)
-	ioutil.WriteFile(root+"/cmd/carapace/cmd/completers_release.go", []byte("//go:build release\n\n"+strings.Replace(content, "/completers/", "/completers_release/", -1)), 0644)
+	os.WriteFile(root+"/cmd/carapace/cmd/completers.go", []byte("//go:build !release\n\n"+content), 0644)
+	os.WriteFile(root+"/cmd/carapace/cmd/completers_release.go", []byte("//go:build release\n\n"+strings.Replace(content, "/completers/", "/completers_release/", -1)), 0644)
 	os.RemoveAll(root + "/completers_release")
 	exec.Command("cp", "-r", root+"/completers", root+"/completers_release").Run()
 
@@ -86,17 +85,17 @@ func executeCompleter(completer string) {
 			for _, file := range files {
 				if !file.IsDir() && strings.HasSuffix(file.Name(), ".go") {
 					path := fmt.Sprintf("%v/completers_release/%v_completer/cmd/%v", root, name, file.Name())
-					content, err := ioutil.ReadFile(path)
+					content, err := os.ReadFile(path)
 					if err == nil && strings.Contains(string(content), "func init() {") {
 						patched := strings.Replace(string(content), "func init() {", fmt.Sprintf("func init_%v() {", strings.TrimSuffix(file.Name(), ".go")), 1)
-						ioutil.WriteFile(path, []byte(patched), os.ModePerm)
+						os.WriteFile(path, []byte(patched), os.ModePerm)
 						initFuncs = append(initFuncs, fmt.Sprintf("	init_%v()", strings.TrimSuffix(file.Name(), ".go")))
 					}
 				}
 			}
 
 			path := fmt.Sprintf("%v/completers_release/%v_completer/cmd/root.go", root, name)
-			content, err := ioutil.ReadFile(path)
+			content, err := os.ReadFile(path)
 			if err == nil {
 				patched := make([]string, 0)
 				for _, line := range strings.Split(string(content), "\n") {
@@ -105,7 +104,7 @@ func executeCompleter(completer string) {
 						patched = append(patched, initFuncs...)
 					}
 				}
-				ioutil.WriteFile(path, []byte(strings.Join(patched, "\n")), os.ModePerm)
+				os.WriteFile(path, []byte(strings.Join(patched, "\n")), os.ModePerm)
 			}
 		}
 	}
@@ -122,7 +121,7 @@ func readCompleters() ([]string, map[string]string) {
 	names := make([]string, 0)
 	descriptions := make(map[string]string)
 	if root, err := rootDir(); err == nil {
-		if files, err := ioutil.ReadDir(root + "/completers/"); err == nil {
+		if files, err := os.ReadDir(root + "/completers/"); err == nil {
 			for _, file := range files {
 				if file.IsDir() && strings.HasSuffix(file.Name(), "_completer") {
 					name := strings.TrimSuffix(file.Name(), "_completer")
@@ -137,7 +136,7 @@ func readCompleters() ([]string, map[string]string) {
 }
 
 func readDescription(root string, completer string) string {
-	if content, err := ioutil.ReadFile(fmt.Sprintf("%v/completers/%v/cmd/root.go", root, completer)); err == nil {
+	if content, err := os.ReadFile(fmt.Sprintf("%v/completers/%v/cmd/root.go", root, completer)); err == nil {
 		re := regexp.MustCompile("^\tShort: +\"(?P<description>.*)\",$")
 		for _, line := range strings.Split(string(content), "\n") {
 			if re.MatchString(line) {

diff --git a/completers/ant_completer/cmd/action/target.go b/completers/ant_completer/cmd/action/target.go
@@ -2,7 +2,7 @@ package action
 
 import (
 	"encoding/xml"
-	"io/ioutil"
+	"os"
 
 	"github.com/rsteube/carapace"
 )
@@ -19,7 +19,7 @@ func ActionTargets(path string) carapace.Action {
 		if path == "" {
 			path = "build.xml"
 		}
-		content, err := ioutil.ReadFile(path)
+		content, err := os.ReadFile(path)
 		if err != nil {
 			return carapace.ActionMessage(err.Error())
 		}

diff --git a/completers/cargo_completer/cmd/action/action.go b/completers/cargo_completer/cmd/action/action.go
@@ -3,7 +3,6 @@ package action
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"regexp"
 	"strings"
@@ -61,7 +60,7 @@ func parseManifest(cmd *cobra.Command) (m manifestToml, err error) {
 	var content []byte
 	var path string
 	if path, err = manifestLocation(cmd); err == nil {
-		if content, err = ioutil.ReadFile(path); err == nil {
+		if content, err = os.ReadFile(path); err == nil {
 			err = toml.Unmarshal(content, &m)
 		}
 	}
@@ -195,7 +194,7 @@ type config struct {
 
 func parseConfig(path string) (c config, err error) {
 	var content []byte
-	if content, err = ioutil.ReadFile(path); err == nil {
+	if content, err = os.ReadFile(path); err == nil {
 		err = toml.Unmarshal(content, &c)
 	}
 	return

diff --git a/completers/flutter_completer/cmd/action/sample.go b/completers/flutter_completer/cmd/action/sample.go
@@ -2,7 +2,6 @@ package action
 
 import (
 	"encoding/json"
-	"io/ioutil"
 	"os"
 	"time"
 
@@ -16,7 +15,7 @@ type sample struct {
 
 func ActionSamples() carapace.Action {
 	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-		tmpfile, err := ioutil.TempFile(os.TempDir(), "carapace-flutter-samples.json")
+		tmpfile, err := os.CreateTemp(os.TempDir(), "carapace-flutter-samples.json")
 		if err != nil {
 			return carapace.ActionMessage(err.Error())
 		}
@@ -30,7 +29,7 @@ func ActionSamples() carapace.Action {
 		}
 		defer os.Remove(tmpfile.Name()) // remove after parsing content
 		return carapace.ActionExecCommand("flutter", "create", "--suppress-analytics", "--list-samples", tmpfile.Name())(func(output []byte) carapace.Action {
-			content, err := ioutil.ReadFile(tmpfile.Name())
+			content, err := os.ReadFile(tmpfile.Name())
 			if err != nil {
 				return carapace.ActionMessage(err.Error())
 			}

diff --git a/completers/gh_completer/cmd/action/config/config_file.go b/completers/gh_completer/cmd/action/config/config_file.go
@@ -3,7 +3,7 @@ package config
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os"
 	"path/filepath"
 	"syscall"
@@ -100,7 +100,7 @@ var ReadConfigFile = func(filename string) ([]byte, error) {
 	}
 	defer f.Close()
 
-	data, err := ioutil.ReadAll(f)
+	data, err := io.ReadAll(f)
 	if err != nil {
 		return nil, err
 	}

diff --git a/completers/glab_completer/cmd/action/alias.go b/completers/glab_completer/cmd/action/alias.go
@@ -1,7 +1,6 @@
 package action
 
 import (
-	"io/ioutil"
 	"os"
 
 	"github.com/rsteube/carapace"
@@ -12,7 +11,7 @@ func LoadAliases() (aliases map[string]string, err error) {
 	var dir string
 	if dir, err = os.UserConfigDir(); err == nil {
 		var content []byte
-		if content, err = ioutil.ReadFile(dir + "/glab-cli/aliases.yml"); err == nil {
+		if content, err = os.ReadFile(dir + "/glab-cli/aliases.yml"); err == nil {
 			err = yaml.Unmarshal(content, &aliases)
 		}
 	}

diff --git a/completers/glab_completer/cmd/action/config.go b/completers/glab_completer/cmd/action/config.go
@@ -1,7 +1,6 @@
 package action
 
 import (
-	"io/ioutil"
 	"os"
 
 	"github.com/rsteube/carapace"
@@ -39,7 +38,7 @@ func loadConfig() (config *glabConfig, err error) {
 	var dir string
 	if dir, err = os.UserConfigDir(); err == nil {
 		var content []byte
-		if content, err = ioutil.ReadFile(dir + "/glab-cli/config.yml"); err == nil {
+		if content, err = os.ReadFile(dir + "/glab-cli/config.yml"); err == nil {
 			err = yaml.Unmarshal(content, &config)
 		}
 	}

diff --git a/completers/helm_completer/cmd/action/repo.go b/completers/helm_completer/cmd/action/repo.go
@@ -2,7 +2,6 @@ package action
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 
 	"github.com/rsteube/carapace"
@@ -23,7 +22,7 @@ func ActionRepositories() carapace.Action {
 			return carapace.ActionMessage(err.Error())
 		}
 
-		content, err := ioutil.ReadFile(dir + "/helm/repositories.yaml")
+		content, err := os.ReadFile(dir + "/helm/repositories.yaml")
 		if err != nil {
 			return carapace.ActionMessage(err.Error())
 		}
@@ -56,7 +55,7 @@ func loadIndex(repo string) (index *index, err error) {
 		return nil, err
 	}
 
-	content, err := ioutil.ReadFile(fmt.Sprintf("%v/helm/repository/%v-index.yaml", dir, repo))
+	content, err := os.ReadFile(fmt.Sprintf("%v/helm/repository/%v-index.yaml", dir, repo))
 	if err != nil {
 		return nil, err
 	}

diff --git a/completers/hugo_completer/cmd/action/config.go b/completers/hugo_completer/cmd/action/config.go
@@ -2,7 +2,6 @@ package action
 
 import (
 	"encoding/json"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -36,7 +35,7 @@ func loadConfig() (c config, err error) {
 	var path string
 	if path, err = configPath(); err == nil {
 		var content []byte
-		if content, err = ioutil.ReadFile(path); err == nil {
+		if content, err = os.ReadFile(path); err == nil {
 			switch filepath.Ext(path) {
 			case ".json":
 				err = json.Unmarshal(content, &c)

diff --git a/completers/hugo_completer/cmd/action/theme.go b/completers/hugo_completer/cmd/action/theme.go
@@ -2,7 +2,6 @@ package action
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -18,7 +17,7 @@ type theme struct {
 
 func loadTheme(path string) (t theme, err error) {
 	var content []byte
-	if content, err = ioutil.ReadFile(path); err == nil {
+	if content, err = os.ReadFile(path); err == nil {
 		err = toml.Unmarshal(content, &t)
 	}
 	return

diff --git a/completers/java_completer/cmd/action/classes.go b/completers/java_completer/cmd/action/classes.go
@@ -2,7 +2,6 @@ package action
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strings"
 
@@ -33,7 +32,7 @@ func ActionClasspathClasses(cmd *cobra.Command) carapace.Action {
 				if !f.IsDir() {
 					files = append(files, path)
 				} else {
-					if fileInfos, err := ioutil.ReadDir(path); err == nil {
+					if fileInfos, err := os.ReadDir(path); err == nil {
 						for _, file := range fileInfos {
 							files = append(files, fmt.Sprintf("%v/%v", path, file.Name()))
 						}

diff --git a/completers/mvn_completer/cmd/action/action.go b/completers/mvn_completer/cmd/action/action.go
@@ -4,7 +4,7 @@ import (
 	"archive/zip"
 	"encoding/xml"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os"
 	"path/filepath"
 	"strings"
@@ -167,7 +167,7 @@ func locatePom(file string) (pom string) {
 
 func loadProject(file string) (project *Project, err error) {
 	var content []byte
-	if content, err = ioutil.ReadFile(locatePom(file)); err == nil {
+	if content, err = os.ReadFile(locatePom(file)); err == nil {
 		err = xml.Unmarshal(content, &project)
 	}
 	return
@@ -180,7 +180,7 @@ func loadPlugin(file string) (plugin *Plugin) {
 			if f.Name == "META-INF/maven/plugin.xml" {
 				if pluginFile, err := f.Open(); err == nil {
 					defer pluginFile.Close()
-					if content, err := ioutil.ReadAll(pluginFile); err == nil {
+					if content, err := io.ReadAll(pluginFile); err == nil {
 						_ = xml.Unmarshal(content, &plugin)
 					}
 				}

diff --git a/completers/ng_completer/cmd/action/config.go b/completers/ng_completer/cmd/action/config.go
@@ -2,7 +2,6 @@ package action
 
 import (
 	"encoding/json"
-	"io/ioutil"
 	"os"
 
 	"github.com/rsteube/carapace"
@@ -27,7 +26,7 @@ func actionConfig(f func(cfg config) carapace.Action) carapace.Action {
 		if err != nil {
 			return carapace.ActionMessage(err.Error())
 		}
-		content, err := ioutil.ReadFile(path)
+		content, err := os.ReadFile(path)
 		if err != nil {
 			return carapace.ActionMessage(err.Error())
 		}

diff --git a/completers/npm_completer/cmd/action/package.go b/completers/npm_completer/cmd/action/package.go
@@ -3,7 +3,6 @@ package action
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strings"
 
@@ -94,7 +93,7 @@ func loadPackageJson() (pj packageJson, err error) {
 	if wd, err = os.Getwd(); err == nil {
 		if packageFile, err = util.FindReverse(wd, "package.json"); err == nil {
 			var content []byte
-			if content, err = ioutil.ReadFile(packageFile); err == nil {
+			if content, err = os.ReadFile(packageFile); err == nil {
 				err = json.Unmarshal(content, &pj)
 			}
 		}

diff --git a/completers/toitpkg_completer/cmd/action/dependency.go b/completers/toitpkg_completer/cmd/action/dependency.go
@@ -1,7 +1,6 @@
 package action
 
 import (
-	"io/ioutil"
 	"os"
 
 	"github.com/rsteube/carapace"
@@ -34,7 +33,7 @@ func ActionDependencies(cmd *cobra.Command) carapace.Action {
 			return carapace.ActionMessage(err.Error())
 		}
 
-		content, err := ioutil.ReadFile(location)
+		content, err := os.ReadFile(location)
 		if err != nil {
 			return carapace.ActionMessage(err.Error())
 		}

diff --git a/completers/vagrant_completer/cmd/action/provisioner.go b/completers/vagrant_completer/cmd/action/provisioner.go
@@ -1,7 +1,6 @@
 package action
 
 import (
-	"io/ioutil"
 	"os"
 	"regexp"
 	"strings"
@@ -22,7 +21,7 @@ func ActionProvisioners() carapace.Action {
 			return carapace.ActionMessage(err.Error())
 		}
 
-		content, err := ioutil.ReadFile(path)
+		content, err := os.ReadFile(path)
 		if err != nil {
 			return carapace.ActionMessage(err.Error())
 		}

diff --git a/pkg/actions/fs/fs.go b/pkg/actions/fs/fs.go
@@ -2,7 +2,7 @@
 package fs
 
 import (
-	"io/ioutil"
+	"os"
 	"strings"
 	"unicode"
 
@@ -14,7 +14,7 @@ import (
 //   subdir/subsubder2
 func ActionSubDirectories(path string) carapace.Action {
 	return carapace.ActionMultiParts("/", func(c carapace.Context) carapace.Action {
-		if files, err := ioutil.ReadDir(path + "/" + strings.Join(c.Parts, "/") + "/"); err != nil {
+		if files, err := os.ReadDir(path + "/" + strings.Join(c.Parts, "/") + "/"); err != nil {
 			return carapace.ActionValues()
 		} else {
 			dirs := make([]string, 0)

diff --git a/pkg/actions/fs/mount.go b/pkg/actions/fs/mount.go
@@ -1,7 +1,7 @@
 package fs
 
 import (
-	"io/ioutil"
+	"os"
 	"strings"
 
 	"github.com/rsteube/carapace"
@@ -13,7 +13,7 @@ import (
 //   /dev (dev)
 func ActionMounts() carapace.Action {
 	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-		content, err := ioutil.ReadFile("/proc/mounts")
+		content, err := os.ReadFile("/proc/mounts")
 		if err != nil {
 			return carapace.ActionMessage(err.Error())
 		}