Remove deprecated functions (#608)

fixtures/fake_dynatrace_api/main.go

@@ -3,7 +3,6 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"net/http"
 	"os"
@@ -45,7 +44,7 @@ func main() {
 			}
 
 		case "/dynatrace-env.sh", "/liboneagentproc.so", "/ruxitagentproc.conf":
-			contents, err := ioutil.ReadFile(strings.TrimPrefix(req.URL.Path, "/"))
+			contents, err := os.ReadFile(strings.TrimPrefix(req.URL.Path, "/"))
 			if err != nil {
 				w.WriteHeader(http.StatusInternalServerError)
 				w.Write([]byte(err.Error()))
@@ -80,15 +79,14 @@ func main() {
 			json.NewEncoder(w).Encode(payload)
 
 		case "/v1/deployment/installer/agent/processmoduleconfig":
-			fakeConfig, err := ioutil.ReadFile("fake_config.json")
+			fakeConfig, err := os.ReadFile("fake_config.json")
 			if err != nil {
 				w.WriteHeader(http.StatusInternalServerError)
 				w.Write([]byte(err.Error()))
 				return
 			}
 			w.Write(fakeConfig)
 
-
 		default:
 			w.WriteHeader(http.StatusNotFound)
 		}

src/python/brats/brats_suite_test.go

@@ -2,7 +2,6 @@ package brats_test
 
 import (
 	"flag"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -68,7 +67,7 @@ func CopyBrats(version string) *cutlass.App {
 	}
 
 	data := "python-" + version
-	Expect(ioutil.WriteFile(filepath.Join(dir, "runtime.txt"), []byte(data), 0644)).To(Succeed())
+	Expect(os.WriteFile(filepath.Join(dir, "runtime.txt"), []byte(data), 0644)).To(Succeed())
 
 	return cutlass.New(dir)
 }

src/python/conda/conda.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -77,7 +76,7 @@ func (c *Conda) Version() string {
 func (c *Conda) Install(version string) error {
 	c.Log.BeginStep("Supplying conda")
 	var installer string
-	if installerDir, err := ioutil.TempDir("", "miniconda"); err != nil {
+	if installerDir, err := os.MkdirTemp("", "miniconda"); err != nil {
 		return err
 	} else {
 		installer = filepath.Join(installerDir, "miniconda.sh")
@@ -92,7 +91,7 @@ func (c *Conda) Install(version string) error {
 	}
 
 	c.Log.BeginStep("Installing Miniconda")
-	if err := c.Command.Execute("/", indentWriter(os.Stdout), ioutil.Discard, installer, "-b", "-p", c.condaHome()); err != nil {
+	if err := c.Command.Execute("/", indentWriter(os.Stdout), io.Discard, installer, "-b", "-p", c.condaHome()); err != nil {
 		return fmt.Errorf("Error installing miniconda: %v", err)
 	}
 
@@ -151,7 +150,7 @@ func (c *Conda) Warning() error {
 	} else if !exists {
 		return nil
 	}
-	if contents, err := ioutil.ReadFile(filepath.Join(c.Stager.BuildDir(), "environment.yml")); err != nil {
+	if contents, err := os.ReadFile(filepath.Join(c.Stager.BuildDir(), "environment.yml")); err != nil {
 		return err
 	} else {
 		if bytes.Contains(contents, []byte("python=")) {

src/python/conda/conda_test.go

@@ -2,16 +2,15 @@ package conda_test
 
 import (
 	"bytes"
-	io "io"
-	"io/ioutil"
+	"io"
 	"os"
 	"path/filepath"
 
 	"github.com/cloudfoundry/python-buildpack/src/python/conda"
 
 	"github.com/cloudfoundry/libbuildpack"
 	"github.com/cloudfoundry/libbuildpack/ansicleaner"
-	gomock "github.com/golang/mock/gomock"
+	"github.com/golang/mock/gomock"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
@@ -36,11 +35,11 @@ var _ = Describe("Conda", func() {
 	)
 
 	BeforeEach(func() {
-		buildDir, err = ioutil.TempDir("", "python-buildpack.build.")
+		buildDir, err = os.MkdirTemp("", "python-buildpack.build.")
 		Expect(err).To(BeNil())
-		cacheDir, err = ioutil.TempDir("", "python-buildpack.cache.")
+		cacheDir, err = os.MkdirTemp("", "python-buildpack.cache.")
 		Expect(err).To(BeNil())
-		depsDir, err = ioutil.TempDir("", "python-buildpack.deps.")
+		depsDir, err = os.MkdirTemp("", "python-buildpack.deps.")
 		Expect(err).To(BeNil())
 		depsIdx = "13"
 		depDir = filepath.Join(depsDir, depsIdx)
@@ -70,7 +69,7 @@ var _ = Describe("Conda", func() {
 	Describe("Version", func() {
 		Context("runtime.txt specifies python 3", func() {
 			BeforeEach(func() {
-				Expect(ioutil.WriteFile(filepath.Join(buildDir, "runtime.txt"), []byte("python-3.2.3"), 0644)).To(Succeed())
+				Expect(os.WriteFile(filepath.Join(buildDir, "runtime.txt"), []byte("python-3.2.3"), 0644)).To(Succeed())
 			})
 
 			It("returns 'miniconda3-py39'", func() {
@@ -88,7 +87,7 @@ var _ = Describe("Conda", func() {
 	Describe("Install", func() {
 		It("downloads and installs miniconda version", func() {
 			mockInstaller.EXPECT().InstallOnlyVersion("Miniconda7", gomock.Any()).Do(func(_, path string) {
-				Expect(ioutil.WriteFile(path, []byte{}, 0644)).To(Succeed())
+				Expect(os.WriteFile(path, []byte{}, 0644)).To(Succeed())
 			})
 			mockCommand.EXPECT().Execute("/", gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any())
 
@@ -97,7 +96,7 @@ var _ = Describe("Conda", func() {
 
 		It("make downloaded file executable", func() {
 			mockInstaller.EXPECT().InstallOnlyVersion("Miniconda7", gomock.Any()).Do(func(_, path string) {
-				Expect(ioutil.WriteFile(path, []byte{}, 0644)).To(Succeed())
+				Expect(os.WriteFile(path, []byte{}, 0644)).To(Succeed())
 			})
 			mockCommand.EXPECT().Execute("/", gomock.Any(), gomock.Any(), gomock.Any(), "-b", "-p", filepath.Join(depDir, "conda")).Do(func(_ string, _, _ io.Writer, path string, _ ...string) {
 				fi, err := os.Lstat(path)
@@ -111,7 +110,7 @@ var _ = Describe("Conda", func() {
 		It("deletes installer", func() {
 			var installerPath string
 			mockInstaller.EXPECT().InstallOnlyVersion("Miniconda7", gomock.Any()).Do(func(_, path string) {
-				Expect(ioutil.WriteFile(path, []byte{}, 0644)).To(Succeed())
+				Expect(os.WriteFile(path, []byte{}, 0644)).To(Succeed())
 				installerPath = path
 			})
 			mockCommand.EXPECT().Execute("/", gomock.Any(), gomock.Any(), gomock.Any(), "-b", "-p", filepath.Join(depDir, "conda")).Do(func(_ string, _, _ io.Writer, path string, _ ...string) {

src/python/finalize/cli/main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"io"
-	"io/ioutil"
 	"os"
 	"time"
 
@@ -15,7 +14,7 @@ import (
 )
 
 func main() {
-	logfile, err := ioutil.TempFile("", "cloudfoundry.python-buildpack.finalize")
+	logfile, err := os.CreateTemp("", "cloudfoundry.python-buildpack.finalize")
 	defer logfile.Close()
 	if err != nil {
 		logger := libbuildpack.NewLogger(os.Stdout)

src/python/finalize/finalize.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -72,24 +71,24 @@ func Run(f *Finalizer) error {
 
 func (f *Finalizer) HandleCollectstatic() error {
 	if len(os.Getenv("DISABLE_COLLECTSTATIC")) > 0 {
-        f.Log.Debug("DISABLE_COLLECTSTATIC > 0, skipping collectstatic")
+		f.Log.Debug("DISABLE_COLLECTSTATIC > 0, skipping collectstatic")
 		return nil
 	}
 
 	exists, err := f.Requirements.FindAnyPackage(f.Stager.BuildDir(), "django", "Django")
 	if err != nil {
-        f.Log.Debug("Error during FindAnyPackage, skipping collectstatic")
+		f.Log.Debug("Error during FindAnyPackage, skipping collectstatic")
 		return err
 	}
 
 	if !exists {
-        f.Log.Debug("Django not in requirements, skipping collectstatic")
+		f.Log.Debug("Django not in requirements, skipping collectstatic")
 		return nil
 	}
 
 	managePyPath, err := f.ManagePyFinder.FindManagePy(f.Stager.BuildDir())
 	if err != nil {
-        f.Log.Debug("Error finding manage.py, skipping collectstatic")
+		f.Log.Debug("Error finding manage.py, skipping collectstatic")
 		return err
 	}
 
@@ -135,14 +134,14 @@ func (f *Finalizer) ReplaceDepsDirWithLiteral() error {
 	for _, dir := range dirs {
 		if err := filepath.Walk(dir, func(path string, _ os.FileInfo, _ error) error {
 			if strings.HasSuffix(path, ".pth") {
-				fileContents, err := ioutil.ReadFile(path)
+				fileContents, err := os.ReadFile(path)
 				if err != nil {
 					return err
 				}
 
 				fileContents = []byte(strings.Replace(string(fileContents), f.Stager.DepDir(), "DOLLAR_DEPS_DIR/"+f.Stager.DepsIdx(), -1))
 
-				if err := ioutil.WriteFile(path, fileContents, 0644); err != nil {
+				if err := os.WriteFile(path, fileContents, 0644); err != nil {
 					return err
 				}
 			}

src/python/finalize/finalize_test.go

@@ -3,7 +3,6 @@ package finalize_test
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path"
@@ -37,10 +36,10 @@ var _ = Describe("Finalize", func() {
 	)
 
 	BeforeEach(func() {
-		buildDir, err = ioutil.TempDir("", "python-buildpack.build.")
+		buildDir, err = os.MkdirTemp("", "python-buildpack.build.")
 		Expect(err).To(BeNil())
 
-		depsDir, err = ioutil.TempDir("", "python-buildpack.deps.")
+		depsDir, err = os.MkdirTemp("", "python-buildpack.deps.")
 		Expect(err).To(BeNil())
 
 		depsIdx = "9"
@@ -135,15 +134,15 @@ var _ = Describe("Finalize", func() {
 		var file string
 		runSubjectAndReadContents := func() string {
 			Expect(finalizer.ReplaceDepsDirWithLiteral()).To(Succeed())
-			contents, err := ioutil.ReadFile(file)
+			contents, err := os.ReadFile(file)
 			Expect(err).ToNot(HaveOccurred())
 			return string(contents)
 		}
 		Context("file at site-packages root", func() {
 			BeforeEach(func() {
 				file = filepath.Join(depsDir, depsIdx, "python", "lib", "python2.7", "site-packages", "easy-install.pth")
 				Expect(os.MkdirAll(path.Dir(file), 0755)).To(Succeed())
-				Expect(ioutil.WriteFile(file, []byte("./pip-9.0.1-py2.7.egg\n"+depsDir+"/9/src/regcore\n"), 0644)).To(Succeed())
+				Expect(os.WriteFile(file, []byte("./pip-9.0.1-py2.7.egg\n"+depsDir+"/9/src/regcore\n"), 0644)).To(Succeed())
 			})
 			It("Converts DepsDir value to '$DEPS_DIR' string", func() {
 				Expect(runSubjectAndReadContents()).To(Equal("./pip-9.0.1-py2.7.egg\nDOLLAR_DEPS_DIR/9/src/regcore\n"))
@@ -153,7 +152,7 @@ var _ = Describe("Finalize", func() {
 			BeforeEach(func() {
 				file = filepath.Join(depsDir, depsIdx, "python", "lib", "python3.2", "site-packages", "something", "extra", "fred.pth")
 				Expect(os.MkdirAll(path.Dir(file), 0755)).To(Succeed())
-				Expect(ioutil.WriteFile(file, []byte(depsDir+"/9/src/bing\n./pip-9.0.1-py2.7.egg\n"+depsDir+"/9/src/regcore\n"), 0644)).To(Succeed())
+				Expect(os.WriteFile(file, []byte(depsDir+"/9/src/bing\n./pip-9.0.1-py2.7.egg\n"+depsDir+"/9/src/regcore\n"), 0644)).To(Succeed())
 			})
 			It("Converts DepsDir value to '$DEPS_DIR' string", func() {
 				Expect(runSubjectAndReadContents()).To(Equal("DOLLAR_DEPS_DIR/9/src/bing\n./pip-9.0.1-py2.7.egg\nDOLLAR_DEPS_DIR/9/src/regcore\n"))
@@ -167,7 +166,7 @@ var _ = Describe("Finalize", func() {
 			BeforeEach(func() {
 				file = filepath.Join(depsDir, depsIdx, "python", "lib", "python2.7", "site-packages", "easy-install.pth")
 				Expect(os.MkdirAll(path.Dir(file), 0755)).To(Succeed())
-				Expect(ioutil.WriteFile(file, []byte("./pip-9.0.1-py2.7.egg\nDOLLAR_DEPS_DIR/9/src/regcore\n"), 0644)).To(Succeed())
+				Expect(os.WriteFile(file, []byte("./pip-9.0.1-py2.7.egg\nDOLLAR_DEPS_DIR/9/src/regcore\n"), 0644)).To(Succeed())
 			})
 			It("At runtime, converts the contents to the runtime depsDir", func() {
 				Expect(finalizer.ReplaceLiteralWithDepsDirAtRuntime()).To(Succeed())
@@ -176,7 +175,7 @@ var _ = Describe("Finalize", func() {
 				cmd.Env = append(os.Environ(), "DEPS_DIR="+depsDir)
 				Expect(cmd.Run()).To(Succeed())
 
-				contents, err := ioutil.ReadFile(file)
+				contents, err := os.ReadFile(file)
 				Expect(err).ToNot(HaveOccurred())
 				Expect(string(contents)).To(Equal("./pip-9.0.1-py2.7.egg\n" + depsDir + "/9/src/regcore\n"))
 			})

src/python/hooks/appdynamics.go

@@ -5,14 +5,14 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"sort"
 	"strings"
 
-	"github.com/cloudfoundry/libbuildpack"
 	"regexp"
+
+	"github.com/cloudfoundry/libbuildpack"
 )
 
 type Command interface {
@@ -73,7 +73,7 @@ func (h AppdynamicsHook) GenerateStartUpCommand(startCommand string) (string, er
 }
 
 func (h AppdynamicsHook) RewriteProcFile(procFilePath string) error {
-	startCommand, err := ioutil.ReadFile(procFilePath)
+	startCommand, err := os.ReadFile(procFilePath)
 	if err != nil {
 		return fmt.Errorf("Error reading file %s: %v", procFilePath, err)
 	}
@@ -82,7 +82,7 @@ func (h AppdynamicsHook) RewriteProcFile(procFilePath string) error {
 		return err
 	}
 
-	if err := ioutil.WriteFile(procFilePath, []byte(newCommand), 0666); err != nil {
+	if err := os.WriteFile(procFilePath, []byte(newCommand), 0666); err != nil {
 		return fmt.Errorf("Error writing file %s: %v", procFilePath, err)
 	}
 	return nil
@@ -113,7 +113,7 @@ func (h AppdynamicsHook) RewriteRequirementsFile(stager *libbuildpack.Stager) er
 	if _, err = f.WriteString(packageName); err != nil {
 		panic(err)
 	}
-	fileContents, _ := ioutil.ReadFile(f.Name())
+	fileContents, _ := os.ReadFile(f.Name())
 	h.Log.Info(string(fileContents))
 
 	return nil
@@ -128,7 +128,7 @@ func (h AppdynamicsHook) RewriteProcFileWithAppdynamics(stager *libbuildpack.Sta
 		if err := h.RewriteProcFile(file); err != nil {
 			return err
 		}
-		fileContents, _ := ioutil.ReadFile(file)
+		fileContents, _ := os.ReadFile(file)
 		h.Log.Info(string(fileContents))
 	} else {
 		h.Log.Info("Cannot find Procfile, skipping this step!")