refactor: use XyzBuildParameters everywhere

Author: sgaist

build.go

@@ -48,10 +48,8 @@ func Build(
 			switch entry.Name {
 			case pipinstall.Manager:
 				if parameters, ok := buildParameters[pipinstall.Manager]; ok {
-					pipParameters := parameters.(pipinstall.PipBuildParameters)
 					pipResult, err := pipinstall.Build(
-						pipParameters.InstallProcess,
-						pipParameters.SitePackagesProcess,
+						parameters.(pipinstall.PipBuildParameters),
 						commonBuildParameters,
 					)(context)
 
@@ -60,18 +58,14 @@ func Build(
 					}
 
 					layers = append(layers, pipResult.Layers...)
-					// return pipResult, err
 				} else {
 					return packit.BuildResult{}, packit.Fail.WithMessage("missing plan for: %s", entry.Name)
 				}
 
 			case pipenvinstall.Manager:
 				if parameters, ok := buildParameters[pipenvinstall.Manager]; ok {
-					pipenvParameters := parameters.(pipenvinstall.PipEnvBuildParameters)
 					pipEnvResult, err := pipenvinstall.Build(
-						pipenvParameters.InstallProcess,
-						pipenvParameters.SiteProcess,
-						pipenvParameters.VenvDirLocator,
+						parameters.(pipenvinstall.PipEnvBuildParameters),
 						commonBuildParameters,
 					)(context)
 
@@ -80,15 +74,13 @@ func Build(
 					}
 
 					layers = append(layers, pipEnvResult.Layers...)
-					// return pipEnvResult, err
 				} else {
 					return packit.BuildResult{}, packit.Fail.WithMessage("missing plan for: %s", entry.Name)
 				}
 			case conda.CondaEnvPlanEntry:
 				if parameters, ok := buildParameters[conda.CondaEnvPlanEntry]; ok {
-					condaParameters := parameters.(conda.CondaBuildParameters)
 					condaResult, err := conda.Build(
-						condaParameters.Runner,
+						parameters.(conda.CondaBuildParameters),
 						commonBuildParameters,
 					)(context)
 
@@ -97,17 +89,13 @@ func Build(
 					}
 
 					layers = append(layers, condaResult.Layers...)
-					// return condaResult, err
 				} else {
 					return packit.BuildResult{}, packit.Fail.WithMessage("missing plan for: %s", entry.Name)
 				}
 			case poetryinstall.PoetryVenv:
 				if parameters, ok := buildParameters[poetryinstall.PoetryVenv]; ok {
-					poetryParameters := parameters.(poetryinstall.PoetryEnvBuildParameters)
 					poetryResult, err := poetryinstall.Build(
-						poetryParameters.EntryResolver,
-						poetryParameters.InstallProcess,
-						poetryParameters.PythonPathLookupProcess,
+						parameters.(poetryinstall.PoetryEnvBuildParameters),
 						commonBuildParameters,
 					)(context)
 
@@ -116,7 +104,6 @@ func Build(
 					}
 
 					layers = append(layers, poetryResult.Layers...)
-					// return poetryResult, err
 				} else {
 					return packit.BuildResult{}, packit.Fail.WithMessage("missing plan for: %s", entry.Name)
 				}

pkg/conda/build.go

@@ -38,10 +38,11 @@ type CondaBuildParameters struct {
 // reuse the environment layer from a previous build, depending on conditions
 // determined by the runner.
 func Build(
-	runner Runner,
+	buildParameters CondaBuildParameters,
 	parameters pythonpackagers.CommonBuildParameters,
 ) packit.BuildFunc {
 	return func(context packit.BuildContext) (packit.BuildResult, error) {
+		runner := buildParameters.Runner
 		sbomGenerator := parameters.SbomGenerator
 		clock := parameters.Clock
 		logger := parameters.Logger

pkg/conda/build_test.go

@@ -63,7 +63,9 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 		logger := scribe.NewEmitter(buffer)
 
 		build = condaenvupdate.Build(
-			runner,
+			condaenvupdate.CondaBuildParameters{
+				runner,
+			},
 			pythonpackagers.CommonBuildParameters{
 				SbomGenerator: sbomGenerator,
 				Clock:         chronos.DefaultClock,

pkg/pip/build.go

@@ -51,11 +51,13 @@ type PipBuildParameters struct {
 // to a packages layer. It also makes use of a cache layer to reuse the pip
 // cache.
 func Build(
-	installProcess InstallProcess,
-	siteProcess SitePackagesProcess,
+	buildParameters PipBuildParameters,
 	parameters pythonpackagers.CommonBuildParameters,
 ) packit.BuildFunc {
 	return func(context packit.BuildContext) (packit.BuildResult, error) {
+		installProcess := buildParameters.InstallProcess
+		siteProcess := buildParameters.SitePackagesProcess
+
 		sbomGenerator := parameters.SbomGenerator
 		clock := parameters.Clock
 		logger := parameters.Logger

pkg/pip/build_test.go

@@ -56,8 +56,10 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 		buffer = bytes.NewBuffer(nil)
 
 		build = pipinstall.Build(
-			installProcess,
-			sitePackagesProcess,
+			pipinstall.PipBuildParameters{
+				installProcess,
+				sitePackagesProcess,
+			},
 			pythonpackagers.CommonBuildParameters{
 				SbomGenerator: sbomGenerator,
 				Clock:         chronos.DefaultClock,

pkg/pipenv/build.go

@@ -51,12 +51,14 @@ type PipEnvBuildParameters struct {
 // packages layer. It also makes use of a cache layer to reuse the pipenv
 // cache.
 func Build(
-	installProcess InstallProcess,
-	siteProcess SitePackagesProcess,
-	venvDirLocator VenvDirLocator,
+	buildParameters PipEnvBuildParameters,
 	parameters pythonpackagers.CommonBuildParameters,
 ) packit.BuildFunc {
 	return func(context packit.BuildContext) (packit.BuildResult, error) {
+		installProcess := buildParameters.InstallProcess
+		siteProcess := buildParameters.SiteProcess
+		venvDirLocator := buildParameters.VenvDirLocator
+
 		sbomGenerator := parameters.SbomGenerator
 		clock := parameters.Clock
 		logger := parameters.Logger

pkg/pipenv/build_test.go

@@ -68,9 +68,11 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 		logEmitter = scribe.NewEmitter(buffer)
 
 		build = pipenvinstall.Build(
-			installProcess,
-			sitePackagesProcess,
-			venvDirLocator,
+			pipenvinstall.PipEnvBuildParameters{
+				installProcess,
+				sitePackagesProcess,
+				venvDirLocator,
+			},
 			pythonpackagers.CommonBuildParameters{
 				SbomGenerator: sbomGenerator,
 				Clock:         chronos.DefaultClock,

pkg/poetry/build.go

@@ -52,12 +52,14 @@ type PoetryEnvBuildParameters struct {
 // Build will install the poetry dependencies by using the pyproject.toml file
 // to a virtual environment layer.
 func Build(
-	entryResolver EntryResolver,
-	installProcess InstallProcess,
-	pythonPathProcess PythonPathLookupProcess,
+	buildParameters PoetryEnvBuildParameters,
 	parameters pythonpackagers.CommonBuildParameters,
 ) packit.BuildFunc {
 	return func(context packit.BuildContext) (packit.BuildResult, error) {
+		entryResolver := buildParameters.EntryResolver
+		installProcess := buildParameters.InstallProcess
+		pythonPathProcess := buildParameters.PythonPathLookupProcess
+
 		sbomGenerator := parameters.SbomGenerator
 		clock := parameters.Clock
 		logger := parameters.Logger

pkg/poetry/build_test.go

@@ -68,9 +68,11 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 		buffer = bytes.NewBuffer(nil)
 
 		build = poetryinstall.Build(
-			entryResolver,
-			installProcess,
-			pythonPathProcess,
+			poetryinstall.PoetryEnvBuildParameters{
+				entryResolver,
+				installProcess,
+				pythonPathProcess,
+			},
 			pythonpackagers.CommonBuildParameters{
 				SbomGenerator: sbomGenerator,
 				Clock:         chronos.DefaultClock,