Refactoring to remove ioutil and custom logger

build.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/paketo-buildpacks/packit"
 	"github.com/paketo-buildpacks/packit/chronos"
+	"github.com/paketo-buildpacks/packit/scribe"
 )
 
 //go:generate faux --interface BuildProcess --output fakes/build_process.go
@@ -29,7 +30,7 @@ func Build(
 	buildProcess BuildProcess,
 	pathManager PathManager,
 	clock chronos.Clock,
-	logs LogEmitter,
+	logs scribe.Emitter,
 	sourceRemover SourceRemover,
 ) packit.BuildFunc {
 
@@ -104,8 +105,7 @@ func Build(
 			})
 		}
 
-		logs.Process("Assigning launch processes")
-		logs.ListProcesses(processes)
+		logs.LaunchProcesses(processes)
 
 		return packit.BuildResult{
 			Layers: []packit.Layer{targetsLayer, goCacheLayer},

build_configuration_parser_test.go

@@ -2,7 +2,6 @@ package gobuild_test
 
 import (
 	"errors"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -28,7 +27,7 @@ func testBuildConfigurationParser(t *testing.T, context spec.G, it spec.S) {
 
 	it.Before(func() {
 		var err error
-		workingDir, err = ioutil.TempDir("", "working-dir")
+		workingDir, err = os.MkdirTemp("", "working-dir")
 		Expect(err).NotTo(HaveOccurred())
 
 		targetManager = &fakes.TargetManager{}
@@ -208,7 +207,7 @@ func testBuildConfigurationParser(t *testing.T, context spec.G, it spec.S) {
 
 	context("when there is a buildpack.yml and environment variables are not set", func() {
 		it.Before(func() {
-			err := ioutil.WriteFile(filepath.Join(workingDir, "buildpack.yml"), nil, 0644)
+			err := os.WriteFile(filepath.Join(workingDir, "buildpack.yml"), nil, 0644)
 			Expect(err).NotTo(HaveOccurred())
 
 			targetManager.CleanAndValidateCall.Returns.StringSlice = []string{"./first", "./second"}
@@ -234,7 +233,7 @@ func testBuildConfigurationParser(t *testing.T, context spec.G, it spec.S) {
 
 	context("when there is a buildpack.yml and environment variables are set", func() {
 		it.Before(func() {
-			err := ioutil.WriteFile(filepath.Join(workingDir, "buildpack.yml"), nil, 0644)
+			err := os.WriteFile(filepath.Join(workingDir, "buildpack.yml"), nil, 0644)
 			Expect(err).NotTo(HaveOccurred())
 
 			os.Setenv("BP_GO_BUILD_IMPORT_PATH", "./some/import/path")
@@ -269,7 +268,7 @@ func testBuildConfigurationParser(t *testing.T, context spec.G, it spec.S) {
 
 	context("buildpack.yml specifies flags including -ldflags and BP_GO_BUILD_LDFLAGS is set", func() {
 		it.Before(func() {
-			err := ioutil.WriteFile(filepath.Join(workingDir, "buildpack.yml"), nil, 0644)
+			err := os.WriteFile(filepath.Join(workingDir, "buildpack.yml"), nil, 0644)
 			Expect(err).NotTo(HaveOccurred())
 
 			buildpackYMLParser.ParseCall.Returns.BuildConfiguration = gobuild.BuildConfiguration{
@@ -319,7 +318,7 @@ func testBuildConfigurationParser(t *testing.T, context spec.G, it spec.S) {
 
 		context("buildpack.yml parsing fails", func() {
 			it.Before(func() {
-				err := ioutil.WriteFile(filepath.Join(workingDir, "buildpack.yml"), nil, 0644)
+				err := os.WriteFile(filepath.Join(workingDir, "buildpack.yml"), nil, 0644)
 				Expect(err).NotTo(HaveOccurred())
 
 				buildpackYMLParser.ParseCall.Returns.Error = errors.New("failed to parse buildpack.yml")

build_test.go

@@ -3,7 +3,6 @@ package gobuild_test
 import (
 	"bytes"
 	"errors"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -13,6 +12,7 @@ import (
 	"github.com/paketo-buildpacks/go-build/fakes"
 	"github.com/paketo-buildpacks/packit"
 	"github.com/paketo-buildpacks/packit/chronos"
+	"github.com/paketo-buildpacks/packit/scribe"
 	"github.com/sclevine/spec"
 
 	. "github.com/onsi/gomega"
@@ -38,13 +38,13 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 
 	it.Before(func() {
 		var err error
-		layersDir, err = ioutil.TempDir("", "layers")
+		layersDir, err = os.MkdirTemp("", "layers")
 		Expect(err).NotTo(HaveOccurred())
 
-		cnbDir, err = ioutil.TempDir("", "cnb")
+		cnbDir, err = os.MkdirTemp("", "cnb")
 		Expect(err).NotTo(HaveOccurred())
 
-		workingDir, err = ioutil.TempDir("", "working-dir")
+		workingDir, err = os.MkdirTemp("", "working-dir")
 		Expect(err).NotTo(HaveOccurred())
 
 		buildProcess = &fakes.BuildProcess{}
@@ -75,7 +75,7 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 			buildProcess,
 			pathManager,
 			clock,
-			gobuild.NewLogEmitter(logs),
+			scribe.NewEmitter(logs),
 			sourceRemover,
 		)
 	})
@@ -242,7 +242,7 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 	context("failure cases", func() {
 		context("when the targets layer cannot be retrieved", func() {
 			it.Before(func() {
-				Expect(ioutil.WriteFile(filepath.Join(layersDir, "targets.toml"), nil, 0000)).To(Succeed())
+				Expect(os.WriteFile(filepath.Join(layersDir, "targets.toml"), nil, 0000)).To(Succeed())
 			})
 
 			it("returns an error", func() {
@@ -263,7 +263,7 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 
 		context("when the gocache layer cannot be retrieved", func() {
 			it.Before(func() {
-				Expect(ioutil.WriteFile(filepath.Join(layersDir, "gocache.toml"), nil, 0000)).To(Succeed())
+				Expect(os.WriteFile(filepath.Join(layersDir, "gocache.toml"), nil, 0000)).To(Succeed())
 			})
 
 			it("returns an error", func() {

buildpack.toml

@@ -1,4 +1,4 @@
-api = "0.4"
+api = "0.5"
 
 [buildpack]
   homepage = "https://github.com/paketo-buildpacks/go-build"

go_build_process.go

@@ -14,6 +14,7 @@ import (
 
 	"github.com/paketo-buildpacks/packit/chronos"
 	"github.com/paketo-buildpacks/packit/pexec"
+	"github.com/paketo-buildpacks/packit/scribe"
 )
 
 //go:generate faux --interface Executable --output fakes/executable.go
@@ -32,11 +33,11 @@ type GoBuildConfiguration struct {
 
 type GoBuildProcess struct {
 	executable Executable
-	logs       LogEmitter
+	logs       scribe.Emitter
 	clock      chronos.Clock
 }
 
-func NewGoBuildProcess(executable Executable, logs LogEmitter, clock chronos.Clock) GoBuildProcess {
+func NewGoBuildProcess(executable Executable, logs scribe.Emitter, clock chronos.Clock) GoBuildProcess {
 	return GoBuildProcess{
 		executable: executable,
 		logs:       logs,

go_build_process_test.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -14,6 +13,7 @@ import (
 	"github.com/paketo-buildpacks/go-build/fakes"
 	"github.com/paketo-buildpacks/packit/chronos"
 	"github.com/paketo-buildpacks/packit/pexec"
+	"github.com/paketo-buildpacks/packit/scribe"
 	"github.com/sclevine/spec"
 
 	. "github.com/onsi/gomega"
@@ -38,16 +38,16 @@ func testGoBuildProcess(t *testing.T, context spec.G, it spec.S) {
 
 	it.Before(func() {
 		var err error
-		layerPath, err = ioutil.TempDir("", "layer")
+		layerPath, err = os.MkdirTemp("", "layer")
 		Expect(err).NotTo(HaveOccurred())
 
-		workspacePath, err = ioutil.TempDir("", "workspace")
+		workspacePath, err = os.MkdirTemp("", "workspace")
 		Expect(err).NotTo(HaveOccurred())
 
-		goPath, err = ioutil.TempDir("", "go-path")
+		goPath, err = os.MkdirTemp("", "go-path")
 		Expect(err).NotTo(HaveOccurred())
 
-		goCache, err = ioutil.TempDir("", "gocache")
+		goCache, err = os.MkdirTemp("", "gocache")
 		Expect(err).NotTo(HaveOccurred())
 
 		logs = bytes.NewBuffer(nil)
@@ -77,7 +77,7 @@ func testGoBuildProcess(t *testing.T, context spec.G, it spec.S) {
 			return t
 		})
 
-		buildProcess = gobuild.NewGoBuildProcess(executable, gobuild.NewLogEmitter(logs), clock)
+		buildProcess = gobuild.NewGoBuildProcess(executable, scribe.NewEmitter(logs), clock)
 	})
 
 	it.After(func() {
@@ -134,7 +134,7 @@ func testGoBuildProcess(t *testing.T, context spec.G, it spec.S) {
 
 	context("when there are build flags", func() {
 		it.Before(func() {
-			Expect(ioutil.WriteFile(filepath.Join(workspacePath, "go.mod"), nil, 0644)).To(Succeed())
+			Expect(os.WriteFile(filepath.Join(workspacePath, "go.mod"), nil, 0644)).To(Succeed())
 			Expect(os.Mkdir(filepath.Join(workspacePath, "vendor"), os.ModePerm)).To(Succeed())
 		})
 
@@ -181,7 +181,7 @@ func testGoBuildProcess(t *testing.T, context spec.G, it spec.S) {
 
 	context("when the GOPATH is empty", func() {
 		it.Before(func() {
-			Expect(ioutil.WriteFile(filepath.Join(workspacePath, "go.mod"), nil, 0644)).To(Succeed())
+			Expect(os.WriteFile(filepath.Join(workspacePath, "go.mod"), nil, 0644)).To(Succeed())
 			Expect(os.Mkdir(filepath.Join(workspacePath, "vendor"), os.ModePerm)).To(Succeed())
 		})
 

go_buildpack_yml_parser.go

@@ -8,14 +8,15 @@ import (
 
 	"github.com/Masterminds/semver"
 	"github.com/buildkite/interpolate"
+	"github.com/paketo-buildpacks/packit/scribe"
 	"gopkg.in/yaml.v2"
 )
 
 type GoBuildpackYMLParser struct {
-	logger LogEmitter
+	logger scribe.Emitter
 }
 
-func NewGoBuildpackYMLParser(logger LogEmitter) GoBuildpackYMLParser {
+func NewGoBuildpackYMLParser(logger scribe.Emitter) GoBuildpackYMLParser {
 	return GoBuildpackYMLParser{
 		logger: logger,
 	}

go_buildpack_yml_parser_test.go

@@ -2,12 +2,12 @@ package gobuild_test
 
 import (
 	"bytes"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
 
 	gobuild "github.com/paketo-buildpacks/go-build"
+	"github.com/paketo-buildpacks/packit/scribe"
 	"github.com/sclevine/spec"
 
 	. "github.com/onsi/gomega"
@@ -25,10 +25,10 @@ func testGoBuildpackYMLParser(t *testing.T, context spec.G, it spec.S) {
 
 	it.Before(func() {
 		var err error
-		workingDir, err = ioutil.TempDir("", "working-dir")
+		workingDir, err = os.MkdirTemp("", "working-dir")
 		Expect(err).NotTo(HaveOccurred())
 
-		Expect(ioutil.WriteFile(filepath.Join(workingDir, "buildpack.yml"), []byte(`---
+		Expect(os.WriteFile(filepath.Join(workingDir, "buildpack.yml"), []byte(`---
 go:
   targets:
   - first
@@ -42,7 +42,7 @@ go:
 `), 0644)).To(Succeed())
 
 		logs = bytes.NewBuffer(nil)
-		goBuildpackYMLParser = gobuild.NewGoBuildpackYMLParser(gobuild.NewLogEmitter(logs))
+		goBuildpackYMLParser = gobuild.NewGoBuildpackYMLParser(scribe.NewEmitter(logs))
 	})
 
 	it.After(func() {
@@ -70,7 +70,7 @@ go:
 
 		context("when the flags have an env var in them", func() {
 			it.Before(func() {
-				Expect(ioutil.WriteFile(filepath.Join(workingDir, "buildpack.yml"), []byte(`---
+				Expect(os.WriteFile(filepath.Join(workingDir, "buildpack.yml"), []byte(`---
 go:
   build:
     flags:
@@ -104,7 +104,7 @@ go:
 
 		context("when the buildpack.yml does not contain go configuration", func() {
 			it.Before(func() {
-				Expect(ioutil.WriteFile(filepath.Join(workingDir, "buildpack.yml"), []byte(`---
+				Expect(os.WriteFile(filepath.Join(workingDir, "buildpack.yml"), []byte(`---
 not-go:
   build:
     flags:
@@ -136,7 +136,7 @@ not-go:
 
 			context("buildpack.yml fails to parse", func() {
 				it.Before(func() {
-					Expect(ioutil.WriteFile(filepath.Join(workingDir, "buildpack.yml"), []byte(`%%%`), 0644)).To(Succeed())
+					Expect(os.WriteFile(filepath.Join(workingDir, "buildpack.yml"), []byte(`%%%`), 0644)).To(Succeed())
 				})
 
 				it("returns an error", func() {
@@ -148,7 +148,7 @@ not-go:
 
 			context("when a the env var interpolation fails", func() {
 				it.Before(func() {
-					Expect(ioutil.WriteFile(filepath.Join(workingDir, "buildpack.yml"), []byte(`---
+					Expect(os.WriteFile(filepath.Join(workingDir, "buildpack.yml"), []byte(`---
 go:
   build:
     flags:

go_path_manager.go

@@ -2,7 +2,6 @@ package gobuild
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -25,7 +24,7 @@ func (m GoPathManager) Setup(workspace, importPath string) (string, string, erro
 		return "", workspace, nil
 	}
 
-	path, err := ioutil.TempDir(m.tempDir, "gopath")
+	path, err := os.MkdirTemp(m.tempDir, "gopath")
 	if err != nil {
 		return "", "", fmt.Errorf("failed to setup GOPATH: %w", err)
 	}

go_path_manager_test.go

@@ -1,7 +1,6 @@
 package gobuild_test
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -22,7 +21,7 @@ func testGoPathManager(t *testing.T, context spec.G, it spec.S) {
 
 	it.Before(func() {
 		var err error
-		tempDir, err = ioutil.TempDir("", "tmp")
+		tempDir, err = os.MkdirTemp("", "tmp")
 		Expect(err).NotTo(HaveOccurred())
 
 		pathManager = gobuild.NewGoPathManager(tempDir)
@@ -37,10 +36,10 @@ func testGoPathManager(t *testing.T, context spec.G, it spec.S) {
 
 		it.Before(func() {
 			var err error
-			workspacePath, err = ioutil.TempDir("", "workspace")
+			workspacePath, err = os.MkdirTemp("", "workspace")
 			Expect(err).NotTo(HaveOccurred())
 
-			Expect(ioutil.WriteFile(filepath.Join(workspacePath, "some-file"), nil, 0644)).To(Succeed())
+			Expect(os.WriteFile(filepath.Join(workspacePath, "some-file"), nil, 0644)).To(Succeed())
 		})
 
 		it.After(func() {
@@ -62,7 +61,7 @@ func testGoPathManager(t *testing.T, context spec.G, it spec.S) {
 
 		context("when the workspace contains a go.mod file", func() {
 			it.Before(func() {
-				Expect(ioutil.WriteFile(filepath.Join(workspacePath, "go.mod"), nil, 0644)).To(Succeed())
+				Expect(os.WriteFile(filepath.Join(workspacePath, "go.mod"), nil, 0644)).To(Succeed())
 			})
 
 			it("does not setup a GOPATH", func() {
@@ -110,7 +109,7 @@ func testGoPathManager(t *testing.T, context spec.G, it spec.S) {
 
 		it.Before(func() {
 			var err error
-			path, err = ioutil.TempDir("", "gopath")
+			path, err = os.MkdirTemp("", "gopath")
 			Expect(err).NotTo(HaveOccurred())
 		})