diff --git a/fixtures/util/dynatrace/main.go b/fixtures/util/dynatrace/main.go index 515d599a5..35761abf3 100644 --- a/fixtures/util/dynatrace/main.go +++ b/fixtures/util/dynatrace/main.go @@ -3,7 +3,6 @@ package main import ( "encoding/json" "fmt" - "io/ioutil" "log" "net/http" "os" @@ -33,7 +32,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) fmt.Fprint(w, err.Error()) @@ -69,7 +68,7 @@ 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())) diff --git a/src/go/brats/brats_suite_test.go b/src/go/brats/brats_suite_test.go index f033d19c0..0ce9a6a54 100644 --- a/src/go/brats/brats_suite_test.go +++ b/src/go/brats/brats_suite_test.go @@ -4,7 +4,6 @@ import ( "bytes" "flag" "fmt" - "io/ioutil" "os" "path/filepath" "sort" @@ -72,10 +71,10 @@ func CopyBrats(version string) *cutlass.App { version = dep.Version } - data, err := ioutil.ReadFile(filepath.Join(dir, "Godeps", "Godeps.json")) + data, err := os.ReadFile(filepath.Join(dir, "Godeps", "Godeps.json")) Expect(err).ToNot(HaveOccurred()) data = bytes.Replace(data, []byte("<%= version %>"), []byte(version), -1) - Expect(ioutil.WriteFile(filepath.Join(dir, "Godeps", "Godeps.json"), data, 0644)).To(Succeed()) + Expect(os.WriteFile(filepath.Join(dir, "Godeps", "Godeps.json"), data, 0644)).To(Succeed()) return cutlass.New(dir) } diff --git a/src/go/finalize/finalize.go b/src/go/finalize/finalize.go index 1f3bf2f1b..b95169f66 100644 --- a/src/go/finalize/finalize.go +++ b/src/go/finalize/finalize.go @@ -6,7 +6,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "os" "path/filepath" "strings" @@ -220,7 +219,7 @@ func (gf *Finalizer) SetupGoPath() error { if goPathInImage { goPath = gf.Stager.BuildDir() } else { - tmpDir, err := ioutil.TempDir("", "gobuildpack.gopath") + tmpDir, err := os.MkdirTemp("", "gobuildpack.gopath") if err != nil { return err } @@ -246,7 +245,7 @@ func (gf *Finalizer) SetupGoPath() error { } if goPathInImage { - files, err := ioutil.ReadDir(gf.Stager.BuildDir()) + files, err := os.ReadDir(gf.Stager.BuildDir()) if err != nil { return err } @@ -304,7 +303,7 @@ func (gf *Finalizer) RunDepEnsure() error { if vendorDirExists { numSubDirs := 0 - files, err := ioutil.ReadDir(filepath.Join(gf.mainPackagePath(), "vendor")) + files, err := os.ReadDir(filepath.Join(gf.mainPackagePath(), "vendor")) if err != nil { return err } @@ -345,7 +344,7 @@ func (gf *Finalizer) RunGlideInstall() error { if vendorDirExists { numSubDirs := 0 - files, err := ioutil.ReadDir(filepath.Join(gf.mainPackagePath(), "vendor")) + files, err := os.ReadDir(filepath.Join(gf.mainPackagePath(), "vendor")) if err != nil { return err } @@ -477,7 +476,7 @@ func (gf *Finalizer) CreateStartupEnvironment(tempDir string) error { mainPkgName = filepath.Base(gf.PackageList[0]) } - err := ioutil.WriteFile(filepath.Join(tempDir, "buildpack-release-step.yml"), []byte(data.ReleaseYAML(mainPkgName)), 0644) + err := os.WriteFile(filepath.Join(tempDir, "buildpack-release-step.yml"), []byte(data.ReleaseYAML(mainPkgName)), 0644) if err != nil { gf.Log.Error("Unable to write release yml: %s", err) return err diff --git a/src/go/finalize/finalize_test.go b/src/go/finalize/finalize_test.go index d658262d7..9e9b93ace 100644 --- a/src/go/finalize/finalize_test.go +++ b/src/go/finalize/finalize_test.go @@ -3,7 +3,6 @@ package finalize_test import ( "bytes" "io" - "io/ioutil" "os" "path/filepath" "regexp" @@ -43,14 +42,14 @@ var _ = Describe("Finalize", func() { ) BeforeEach(func() { - depsDir, err = ioutil.TempDir("", "go-buildpack.build.") + depsDir, err = os.MkdirTemp("", "go-buildpack.build.") Expect(err).To(BeNil()) depsIdx = "06" err = os.MkdirAll(filepath.Join(depsDir, depsIdx), 0755) Expect(err).To(BeNil()) - buildDir, err = ioutil.TempDir("", "go-buildpack.build.") + buildDir, err = os.MkdirTemp("", "go-buildpack.build.") Expect(err).To(BeNil()) buffer = new(bytes.Buffer) @@ -90,7 +89,7 @@ var _ = Describe("Finalize", func() { Describe("NewFinalizer", func() { Context("the vendor tool is godep", func() { BeforeEach(func() { - ioutil.WriteFile(filepath.Join(depsDir, depsIdx, "config.yml"), []byte(`name: "go" + os.WriteFile(filepath.Join(depsDir, depsIdx, "config.yml"), []byte(`name: "go" config: GoVersion: 1.4.2 VendorTool: godep @@ -109,7 +108,7 @@ config: }) Context("the vendor tool is glide", func() { BeforeEach(func() { - ioutil.WriteFile(filepath.Join(depsDir, depsIdx, "config.yml"), []byte(`name: "go" + os.WriteFile(filepath.Join(depsDir, depsIdx, "config.yml"), []byte(`name: "go" config: GoVersion: 1.2.4 VendorTool: glide @@ -126,7 +125,7 @@ config: }) Context("the vendor tool is dep", func() { BeforeEach(func() { - ioutil.WriteFile(filepath.Join(depsDir, depsIdx, "config.yml"), []byte(`name: "go" + os.WriteFile(filepath.Join(depsDir, depsIdx, "config.yml"), []byte(`name: "go" config: GoVersion: 1.9.0 VendorTool: dep @@ -256,19 +255,19 @@ config: oldGoBin = os.Getenv("GOBIN") oldGoSetupGopathInImage = os.Getenv("GO_SETUP_GOPATH_IN_IMAGE") - err := ioutil.WriteFile(filepath.Join(buildDir, "main.go"), []byte("xx"), 0644) + err := os.WriteFile(filepath.Join(buildDir, "main.go"), []byte("xx"), 0644) Expect(err).To(BeNil()) err = os.MkdirAll(filepath.Join(buildDir, "vendor"), 0755) Expect(err).To(BeNil()) - err = ioutil.WriteFile(filepath.Join(buildDir, "vendor", "lib.go"), []byte("xx"), 0644) + err = os.WriteFile(filepath.Join(buildDir, "vendor", "lib.go"), []byte("xx"), 0644) Expect(err).To(BeNil()) - err = ioutil.WriteFile(filepath.Join(buildDir, "Procfile"), []byte("xx"), 0644) + err = os.WriteFile(filepath.Join(buildDir, "Procfile"), []byte("xx"), 0644) Expect(err).To(BeNil()) - err = ioutil.WriteFile(filepath.Join(buildDir, ".profile"), []byte("xx"), 0644) + err = os.WriteFile(filepath.Join(buildDir, ".profile"), []byte("xx"), 0644) Expect(err).To(BeNil()) err = os.MkdirAll(filepath.Join(buildDir, ".cloudfoundry"), 0755) @@ -277,7 +276,7 @@ config: err = os.MkdirAll(filepath.Join(buildDir, ".profile.d"), 0755) Expect(err).To(BeNil()) - err = ioutil.WriteFile(filepath.Join(buildDir, ".profile.d", "filename.sh"), []byte("xx"), 0644) + err = os.WriteFile(filepath.Join(buildDir, ".profile.d", "filename.sh"), []byte("xx"), 0644) Expect(err).To(BeNil()) }) @@ -473,7 +472,7 @@ config: BeforeEach(func() { mainPackageName = "a/package/name" - goPath, err = ioutil.TempDir("", "go-buildpack.package") + goPath, err = os.MkdirTemp("", "go-buildpack.package") Expect(err).To(BeNil()) mainPackagePath = filepath.Join(goPath, "src", mainPackageName) @@ -515,7 +514,7 @@ config: BeforeEach(func() { mainPackageName = "a/package/name" - goPath, err = ioutil.TempDir("", "go-buildpack.package") + goPath, err = os.MkdirTemp("", "go-buildpack.package") Expect(err).To(BeNil()) mainPackagePath = filepath.Join(goPath, "src", mainPackageName) @@ -641,7 +640,7 @@ config: BeforeEach(func() { mainPackageName = "a/package/name" - goPath, err = ioutil.TempDir("", "go-buildpack.package") + goPath, err = os.MkdirTemp("", "go-buildpack.package") Expect(err).To(BeNil()) mainPackagePath = filepath.Join(goPath, "src", mainPackageName) @@ -984,7 +983,7 @@ config: packageList = []string{"first", "second"} buildFlags = []string{"-a=1", "-b=2"} - goPath, err = ioutil.TempDir("", "go-buildpack.gopath") + goPath, err = os.MkdirTemp("", "go-buildpack.gopath") Expect(err).To(BeNil()) mainPackagePath = filepath.Join(goPath, "src", "first") @@ -1102,7 +1101,7 @@ config: err = os.MkdirAll(goDir, 0755) Expect(err).To(BeNil()) - tempDir, err = ioutil.TempDir("", "gobuildpack.releaseyml") + tempDir, err = os.MkdirTemp("", "gobuildpack.releaseyml") Expect(err).To(BeNil()) }) @@ -1110,7 +1109,7 @@ config: err = gf.CreateStartupEnvironment(tempDir) Expect(err).To(BeNil()) - contents, err := ioutil.ReadFile(filepath.Join(tempDir, "buildpack-release-step.yml")) + contents, err := os.ReadFile(filepath.Join(tempDir, "buildpack-release-step.yml")) Expect(err).To(BeNil()) yaml := `--- @@ -1124,7 +1123,7 @@ default_process_types: err = gf.CreateStartupEnvironment(tempDir) Expect(err).To(BeNil()) - contents, err := ioutil.ReadFile(filepath.Join(gf.Stager.DepDir(), "profile.d", "go.sh")) + contents, err := os.ReadFile(filepath.Join(gf.Stager.DepDir(), "profile.d", "go.sh")) Expect(err).To(BeNil()) Expect(string(contents)).To(Equal("PATH=$PATH:$HOME/bin\n")) @@ -1135,10 +1134,10 @@ default_process_types: err = os.MkdirAll(filepath.Join(depsDir, "06", "go3.4.5"), 0755) Expect(err).To(BeNil()) - err = ioutil.WriteFile(filepath.Join(depsDir, "06", "go3.4.5", "thing.txt"), []byte("abc"), 0644) + err = os.WriteFile(filepath.Join(depsDir, "06", "go3.4.5", "thing.txt"), []byte("abc"), 0644) Expect(err).To(BeNil()) - err = ioutil.WriteFile(filepath.Join(depsDir, "06", "config.yml"), []byte("some yaml"), 0644) + err = os.WriteFile(filepath.Join(depsDir, "06", "config.yml"), []byte("some yaml"), 0644) Expect(err).To(BeNil()) }) @@ -1148,7 +1147,7 @@ default_process_types: Expect(filepath.Join(depsDir, "06", "go3.4.5")).NotTo(BeADirectory()) - content, err := ioutil.ReadFile(filepath.Join(filepath.Join(depsDir, "06"), "config.yml")) + content, err := os.ReadFile(filepath.Join(filepath.Join(depsDir, "06"), "config.yml")) Expect(err).To(BeNil()) Expect(string(content)).To(Equal("some yaml")) }) @@ -1214,7 +1213,7 @@ default_process_types: err = gf.CreateStartupEnvironment(tempDir) Expect(err).To(BeNil()) - contents, err := ioutil.ReadFile(filepath.Join(gf.Stager.DepDir(), "profile.d", "zzgopath.sh")) + contents, err := os.ReadFile(filepath.Join(gf.Stager.DepDir(), "profile.d", "zzgopath.sh")) Expect(err).To(BeNil()) Expect(string(contents)).To(ContainSubstring("export GOPATH=$HOME")) diff --git a/src/go/hooks/appdynamics_test.go b/src/go/hooks/appdynamics_test.go index 4c573b946..7fa87709b 100644 --- a/src/go/hooks/appdynamics_test.go +++ b/src/go/hooks/appdynamics_test.go @@ -2,7 +2,6 @@ package hooks_test import ( "bytes" - "io/ioutil" "os" "path/filepath" @@ -39,10 +38,10 @@ var _ = Describe("Appdynamics", func() { ) BeforeEach(func() { - buildDir, err = ioutil.TempDir("", "go-buildpack.build.") + buildDir, err = os.MkdirTemp("", "go-buildpack.build.") Expect(err).To(BeNil()) - depsDir, err = ioutil.TempDir("", "go-buildpack.deps.") + depsDir, err = os.MkdirTemp("", "go-buildpack.deps.") Expect(err).To(BeNil()) buffer = new(bytes.Buffer) @@ -91,7 +90,7 @@ export APPD_KEY_2=APPD_VAL_2` export APPD_KEY_1=APPD_VAL_1 export APPD_KEY_2=APPD_VAL_2` - script, err := ioutil.ReadFile(appdynamicsShellScript) + script, err := os.ReadFile(appdynamicsShellScript) Expect(err).To(BeNil()) Expect(string(script)).To(Equal(expectedScript)) }) @@ -144,7 +143,7 @@ export APPD_KEY_2=APPD_VAL_2` Expect(err).To(BeNil()) Expect(libbuildpack.FileExists(filepath.Join(stager.DepDir(), "profile.d", "appdynamics.sh"))).To(BeTrue()) - appdynamicsInfo, err := ioutil.ReadFile(filepath.Join(stager.DepDir(), "profile.d", "appdynamics.sh")) + appdynamicsInfo, err := os.ReadFile(filepath.Join(stager.DepDir(), "profile.d", "appdynamics.sh")) expectedInfo := `# Autogenerated Appdynamics Script export APPD_ACCOUNT_ACCESS_KEY=key diff --git a/src/go/supply/supply.go b/src/go/supply/supply.go index a0b1ad2d4..baf602c2b 100644 --- a/src/go/supply/supply.go +++ b/src/go/supply/supply.go @@ -4,7 +4,6 @@ import ( "encoding/json" "errors" "fmt" - "io/ioutil" "os" "path/filepath" "slices" @@ -296,13 +295,13 @@ func (gs *Supplier) isGoPath() (bool, error) { return false, nil } - files, err := ioutil.ReadDir(filepath.Join(gs.Stager.BuildDir(), "src")) + files, err := os.ReadDir(filepath.Join(gs.Stager.BuildDir(), "src")) if err != nil { return false, err } for _, file := range files { - if file.Mode().IsDir() { + if file.IsDir() { err = filepath.Walk(filepath.Join(srcDir, file.Name()), isGoFile) if err != nil { if err.Error() == "found Go file" { diff --git a/src/go/supply/supply_test.go b/src/go/supply/supply_test.go index fdb8586e6..e8e1d6172 100644 --- a/src/go/supply/supply_test.go +++ b/src/go/supply/supply_test.go @@ -2,7 +2,6 @@ package supply_test import ( "bytes" - "io/ioutil" "os" "path/filepath" "time" @@ -37,15 +36,15 @@ var _ = Describe("Supply", func() { ) BeforeEach(func() { - bpDir, err = ioutil.TempDir("", "go-buildpack.bpDir.") + bpDir, err = os.MkdirTemp("", "go-buildpack.bpDir.") Expect(err).To(BeNil()) - Expect(ioutil.WriteFile(filepath.Join(bpDir, "manifest.yml"), []byte("{}"), 0644)).To(Succeed()) - Expect(ioutil.WriteFile(filepath.Join(bpDir, "VERSION"), []byte("1.2.3"), 0644)).To(Succeed()) + Expect(os.WriteFile(filepath.Join(bpDir, "manifest.yml"), []byte("{}"), 0644)).To(Succeed()) + Expect(os.WriteFile(filepath.Join(bpDir, "VERSION"), []byte("1.2.3"), 0644)).To(Succeed()) - buildDir, err = ioutil.TempDir("", "go-buildpack.build.") + buildDir, err = os.MkdirTemp("", "go-buildpack.build.") Expect(err).To(BeNil()) - depsDir, err = ioutil.TempDir("", "go-buildpack.deps.") + depsDir, err = os.MkdirTemp("", "go-buildpack.deps.") Expect(err).To(BeNil()) depsIdx = "04" @@ -99,7 +98,7 @@ var _ = Describe("Supply", func() { Expect(err).To(BeNil()) godepsJson = filepath.Join(buildDir, "Godeps", "Godeps.json") - err = ioutil.WriteFile(godepsJson, []byte(godepsJsonContents), 0644) + err = os.WriteFile(godepsJson, []byte(godepsJsonContents), 0644) Expect(err).To(BeNil()) }) @@ -190,7 +189,7 @@ var _ = Describe("Supply", func() { Context("there is a go.mod file", func() { BeforeEach(func() { - Expect(ioutil.WriteFile(filepath.Join(buildDir, "go.mod"), []byte("xxx"), 0666)).To(Succeed()) + Expect(os.WriteFile(filepath.Join(buildDir, "go.mod"), []byte("xxx"), 0666)).To(Succeed()) }) AfterEach(func() { @@ -213,7 +212,7 @@ var _ = Describe("Supply", func() { Context("there is a .godir file", func() { BeforeEach(func() { - err = ioutil.WriteFile(filepath.Join(buildDir, ".godir"), []byte("xxx"), 0644) + err = os.WriteFile(filepath.Join(buildDir, ".godir"), []byte("xxx"), 0644) }) It("logs that .godir is deprecated and returns an error", func() { @@ -227,7 +226,7 @@ var _ = Describe("Supply", func() { Context("there is a glide.yaml file", func() { BeforeEach(func() { - err = ioutil.WriteFile(filepath.Join(buildDir, "glide.yaml"), []byte("xxx"), 0644) + err = os.WriteFile(filepath.Join(buildDir, "glide.yaml"), []byte("xxx"), 0644) Expect(err).To(BeNil()) }) @@ -244,13 +243,13 @@ var _ = Describe("Supply", func() { err = os.MkdirAll(filepath.Join(buildDir, "src", "package"), 0755) Expect(err).To(BeNil()) - err = ioutil.WriteFile(filepath.Join(buildDir, "src", "package", "thing.go"), []byte("xxx"), 0644) + err = os.WriteFile(filepath.Join(buildDir, "src", "package", "thing.go"), []byte("xxx"), 0644) Expect(err).To(BeNil()) }) }) Context("there is a Gopkg.toml", func() { BeforeEach(func() { - err = ioutil.WriteFile(filepath.Join(buildDir, "Gopkg.toml"), []byte("xxx"), 0644) + err = os.WriteFile(filepath.Join(buildDir, "Gopkg.toml"), []byte("xxx"), 0644) Expect(err).To(BeNil()) }) @@ -432,11 +431,11 @@ var _ = Describe("Supply", func() { err = gs.InstallGo() Expect(err).To(BeNil()) - contents, err := ioutil.ReadFile(filepath.Join(depsDir, depsIdx, "env", "GOROOT")) + contents, err := os.ReadFile(filepath.Join(depsDir, depsIdx, "env", "GOROOT")) Expect(err).To(BeNil()) Expect(string(contents)).To(Equal(filepath.Join(goInstallDir))) - contents, err = ioutil.ReadFile(filepath.Join(depsDir, depsIdx, "env", "GO111MODULE")) + contents, err = os.ReadFile(filepath.Join(depsDir, depsIdx, "env", "GO111MODULE")) Expect(err).To(BeNil()) Expect(string(contents)).To(Equal("auto")) }) @@ -462,7 +461,7 @@ var _ = Describe("Supply", func() { err = gs.WriteGoRootToProfileD() Expect(err).To(BeNil()) - contents, err := ioutil.ReadFile(filepath.Join(depsDir, depsIdx, "profile.d", "goroot.sh")) + contents, err := os.ReadFile(filepath.Join(depsDir, depsIdx, "profile.d", "goroot.sh")) Expect(err).To(BeNil()) Expect(string(contents)).To(ContainSubstring("export GOROOT=$DEPS_DIR/04/go3.4.5"))