refactor: code cleanup

build.go

@@ -16,7 +16,7 @@ import (
 	poetryinstall "github.com/paketo-buildpacks/python-packagers/pkg/packagers/poetry"
 	uvinstall "github.com/paketo-buildpacks/python-packagers/pkg/packagers/uv"
 
-	pythonpackagers "github.com/paketo-buildpacks/python-packagers/pkg/packagers/common"
+	"github.com/paketo-buildpacks/python-packagers/pkg/build"
 )
 
 // filtered returns the slice passed in parameter with the needle removed
@@ -37,7 +37,7 @@ type PackagerParameters interface {
 
 func Build(
 	logger scribe.Emitter,
-	commonBuildParameters pythonpackagers.CommonBuildParameters,
+	commonBuildParameters build.CommonBuildParameters,
 	buildParameters map[string]PackagerParameters,
 ) packit.BuildFunc {
 	return func(context packit.BuildContext) (packit.BuildResult, error) {

build_test.go

@@ -17,7 +17,7 @@ import (
 	"github.com/paketo-buildpacks/packit/v2/scribe"
 
 	pythonpackagers "github.com/paketo-buildpacks/python-packagers"
-	pkgcommon "github.com/paketo-buildpacks/python-packagers/pkg/packagers/common"
+	"github.com/paketo-buildpacks/python-packagers/pkg/build"
 	conda "github.com/paketo-buildpacks/python-packagers/pkg/packagers/conda"
 	condafakes "github.com/paketo-buildpacks/python-packagers/pkg/packagers/conda/fakes"
 	pipinstall "github.com/paketo-buildpacks/python-packagers/pkg/packagers/pip"
@@ -28,6 +28,7 @@ import (
 	poetryfakes "github.com/paketo-buildpacks/python-packagers/pkg/packagers/poetry/fakes"
 	uvinstall "github.com/paketo-buildpacks/python-packagers/pkg/packagers/uv"
 	uvfakes "github.com/paketo-buildpacks/python-packagers/pkg/packagers/uv/fakes"
+	sbomfakes "github.com/paketo-buildpacks/python-packagers/pkg/sbom/fakes"
 
 	"github.com/sclevine/spec"
 
@@ -44,11 +45,11 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 
 		buffer       *bytes.Buffer
 		logger       scribe.Emitter
-		build        packit.BuildFunc
+		buildFunc    packit.BuildFunc
 		buildContext packit.BuildContext
 
 		// common
-		sbomGenerator *pipfakes.SBOMGenerator
+		sbomGenerator *sbomfakes.SBOMGenerator
 
 		// conda
 		runner *condafakes.Runner
@@ -70,7 +71,7 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 		// uv
 		uvRunner *uvfakes.Runner
 
-		buildParameters pkgcommon.CommonBuildParameters
+		buildParameters build.CommonBuildParameters
 
 		plans []packit.BuildpackPlan
 	)
@@ -83,7 +84,7 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 		buffer = bytes.NewBuffer(nil)
 		logger = scribe.NewEmitter(buffer)
 
-		sbomGenerator = &pipfakes.SBOMGenerator{}
+		sbomGenerator = &sbomfakes.SBOMGenerator{}
 		sbomGenerator.GenerateCall.Returns.SBOM = sbom.SBOM{}
 
 		// conda
@@ -113,8 +114,8 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 		// uv
 		uvRunner = &uvfakes.Runner{}
 
-		buildParameters = pkgcommon.CommonBuildParameters{
-			SbomGenerator: pkgcommon.Generator{},
+		buildParameters = build.CommonBuildParameters{
+			SbomGenerator: sbomGenerator,
 			Clock:         chronos.DefaultClock,
 			Logger:        logger,
 		}
@@ -142,7 +143,7 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 			},
 		}
 
-		build = pythonpackagers.Build(logger, buildParameters, packagerParameters)
+		buildFunc = pythonpackagers.Build(logger, buildParameters, packagerParameters)
 
 		buildContext = packit.BuildContext{
 			BuildpackInfo: packit.BuildpackInfo{
@@ -221,7 +222,7 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 	it("runs the build process and returns expected layers", func() {
 		for _, plan := range plans {
 			buildContext.Plan = plan
-			result, err := build(buildContext)
+			result, err := buildFunc(buildContext)
 			Expect(err).NotTo(HaveOccurred())
 
 			layers := result.Layers
@@ -232,11 +233,11 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 	it("fails if packager parameters is missing", func() {
 		packagerParameters := map[string]pythonpackagers.PackagerParameters{}
 
-		build = pythonpackagers.Build(logger, buildParameters, packagerParameters)
+		buildFunc = pythonpackagers.Build(logger, buildParameters, packagerParameters)
 
 		for _, plan := range plans {
 			buildContext.Plan = plan
-			_, err := build(buildContext)
+			_, err := buildFunc(buildContext)
 			Expect(err).To(HaveOccurred())
 		}
 	})

detect_test.go

@@ -13,8 +13,9 @@ import (
 
 	"github.com/paketo-buildpacks/packit/v2"
 	"github.com/paketo-buildpacks/packit/v2/scribe"
+
 	pythonpackagers "github.com/paketo-buildpacks/python-packagers"
-	common "github.com/paketo-buildpacks/python-packagers/pkg/packagers/common"
+	"github.com/paketo-buildpacks/python-packagers/pkg/build"
 	conda "github.com/paketo-buildpacks/python-packagers/pkg/packagers/conda"
 	pip "github.com/paketo-buildpacks/python-packagers/pkg/packagers/pip"
 	pipenv "github.com/paketo-buildpacks/python-packagers/pkg/packagers/pipenv"
@@ -72,7 +73,7 @@ func testDetect(t *testing.T, context spec.G, it spec.S) {
 					Requires: []packit.BuildPlanRequirement{
 						{
 							Name: conda.CondaPlanEntry,
-							Metadata: common.BuildPlanMetadata{
+							Metadata: build.BuildPlanMetadata{
 								Build: true,
 							},
 						},
@@ -102,7 +103,7 @@ func testDetect(t *testing.T, context spec.G, it spec.S) {
 					Requires: []packit.BuildPlanRequirement{
 						{
 							Name: conda.CondaPlanEntry,
-							Metadata: common.BuildPlanMetadata{
+							Metadata: build.BuildPlanMetadata{
 								Build: true,
 							},
 						},
@@ -134,19 +135,19 @@ func testDetect(t *testing.T, context spec.G, it spec.S) {
 					Requires: []packit.BuildPlanRequirement{
 						{
 							Name: pip.CPython,
-							Metadata: common.BuildPlanMetadata{
+							Metadata: build.BuildPlanMetadata{
 								Build: true,
 							},
 						},
 						{
 							Name: pip.Pip,
-							Metadata: common.BuildPlanMetadata{
+							Metadata: build.BuildPlanMetadata{
 								Build: true,
 							},
 						},
 						{
 							Name: pip.Manager,
-							Metadata: common.BuildPlanMetadata{
+							Metadata: build.BuildPlanMetadata{
 								Build: true,
 							},
 						},
@@ -178,19 +179,19 @@ func testDetect(t *testing.T, context spec.G, it spec.S) {
 					Requires: []packit.BuildPlanRequirement{
 						{
 							Name: pipenv.CPython,
-							Metadata: common.BuildPlanMetadata{
+							Metadata: build.BuildPlanMetadata{
 								Build: true,
 							},
 						},
 						{
 							Name: pipenv.Pipenv,
-							Metadata: common.BuildPlanMetadata{
+							Metadata: build.BuildPlanMetadata{
 								Build: true,
 							},
 						},
 						{
 							Name: pipenv.Manager,
-							Metadata: common.BuildPlanMetadata{
+							Metadata: build.BuildPlanMetadata{
 								Build: true,
 							},
 						},
@@ -219,13 +220,13 @@ func testDetect(t *testing.T, context spec.G, it spec.S) {
 					Requires: []packit.BuildPlanRequirement{
 						{
 							Name: poetry.CPython,
-							Metadata: common.BuildPlanMetadata{
+							Metadata: build.BuildPlanMetadata{
 								Build: true,
 							},
 						},
 						{
 							Name: poetry.Poetry,
-							Metadata: common.BuildPlanMetadata{
+							Metadata: build.BuildPlanMetadata{
 								Build: true,
 							},
 						},
@@ -255,7 +256,7 @@ func testDetect(t *testing.T, context spec.G, it spec.S) {
 					Requires: []packit.BuildPlanRequirement{
 						{
 							Name: uv.UvPlanEntry,
-							Metadata: common.BuildPlanMetadata{
+							Metadata: build.BuildPlanMetadata{
 								Build: true,
 							},
 						},
@@ -290,7 +291,7 @@ func testDetect(t *testing.T, context spec.G, it spec.S) {
 					Requires: []packit.BuildPlanRequirement{
 						{
 							Name: uv.UvPlanEntry,
-							Metadata: common.BuildPlanMetadata{
+							Metadata: build.BuildPlanMetadata{
 								Build: true,
 							},
 						},

pkg/packagers/common/common.go → pkg/build/build.go

@@ -3,23 +3,14 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package pythonpackagers
+package build
 
 import (
 	"github.com/paketo-buildpacks/packit/v2/chronos"
-	"github.com/paketo-buildpacks/packit/v2/sbom"
 	"github.com/paketo-buildpacks/packit/v2/scribe"
-)
-
-type SBOMGenerator interface {
-	Generate(dir string) (sbom.SBOM, error)
-}
 
-type Generator struct{}
-
-func (f Generator) Generate(dir string) (sbom.SBOM, error) {
-	return sbom.Generate(dir)
-}
+	"github.com/paketo-buildpacks/python-packagers/pkg/sbom"
+)
 
 // BuildPlanMetadata is the buildpack-specific data included in build plan
 // requirements.
@@ -37,7 +28,7 @@ type BuildPlanMetadata struct {
 // CommonBuildParameters are the parameters shared
 // by all packager build function implementation
 type CommonBuildParameters struct {
-	SbomGenerator SBOMGenerator
+	SbomGenerator sbom.SBOMGenerator
 	Clock         chronos.Clock
 	Logger        scribe.Emitter
 }

pkg/executable/executable.go

@@ -0,0 +1,16 @@
+// SPDX-FileCopyrightText: Copyright (c) 2013-Present CloudFoundry.org Foundation, Inc. All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+
+package executable
+
+import (
+	"github.com/paketo-buildpacks/packit/v2/pexec"
+)
+
+//go:generate faux --interface Executable --output fakes/executable.go
+
+// Executable defines the interface for invoking an executable.
+type Executable interface {
+	Execute(pexec.Execution) error
+}

pkg/packagers/conda/build.go

@@ -13,11 +13,10 @@ import (
 	"github.com/paketo-buildpacks/packit/v2/fs"
 	"github.com/paketo-buildpacks/packit/v2/sbom"
 
-	pythonpackagers "github.com/paketo-buildpacks/python-packagers/pkg/packagers/common"
+	"github.com/paketo-buildpacks/python-packagers/pkg/build"
 )
 
 //go:generate faux --interface Runner --output fakes/runner.go
-//go:generate faux --interface SBOMGenerator --output fakes/sbom_generator.go
 
 // Runner defines the interface for setting up the conda environment.
 type Runner interface {
@@ -39,7 +38,7 @@ type CondaBuildParameters struct {
 // determined by the runner.
 func Build(
 	buildParameters CondaBuildParameters,
-	parameters pythonpackagers.CommonBuildParameters,
+	parameters build.CommonBuildParameters,
 ) packit.BuildFunc {
 	return func(context packit.BuildContext) (packit.BuildResult, error) {
 		runner := buildParameters.Runner