Drop the isBuildLess optimization. (#1975)

There is only a single package in Wolfi that exhibits this.

Signed-off-by: Matt Moore <mattmoor@chainguard.dev>

Author: mattmoor

.github/workflows/wolfi-presubmit.yaml

@@ -74,6 +74,7 @@ jobs:
           - fping
           - subversion
           - sudo
+          - py3-supported-python
           # TODO: https://github.com/wolfi-dev/os/issues/26442
           #- xmlto
 

pkg/build/build.go

@@ -521,13 +521,6 @@ func (b *Build) overlayBinSh() error {
 	return nil
 }
 
-// isBuildLess returns true if the build context does not actually do any building.
-// TODO(kaniini): Improve the heuristic for this by checking for uses/runs statements
-// in the pipeline.
-func (b *Build) isBuildLess() bool {
-	return len(b.Configuration.Pipeline) == 0
-}
-
 // getBuildConfigPURL determines the package URL for the melange config file
 // itself.
 func (b Build) getBuildConfigPURL() (*purl.PackageURL, error) {
@@ -732,69 +725,67 @@ func (b *Build) BuildPackage(ctx context.Context) error {
 	linterQueue := []linterTarget{}
 	cfg := b.workspaceConfig(ctx)
 
-	if !b.isBuildLess() {
-		// Prepare guest directory
-		if err := os.MkdirAll(b.GuestDir, 0o755); err != nil {
-			return fmt.Errorf("mkdir -p %s: %w", b.GuestDir, err)
-		}
-
-		log.Infof("building workspace in '%s' with apko", b.GuestDir)
-
-		guestFS := apkofs.DirFS(b.GuestDir, apkofs.WithCreateDir())
-		imgRef, err := b.buildGuest(ctx, b.Configuration.Environment, guestFS)
-		if err != nil {
-			return fmt.Errorf("unable to build guest: %w", err)
-		}
+	// Prepare guest directory
+	if err := os.MkdirAll(b.GuestDir, 0o755); err != nil {
+		return fmt.Errorf("mkdir -p %s: %w", b.GuestDir, err)
+	}
 
-		cfg.ImgRef = imgRef
-		log.Debugf("ImgRef = %s", cfg.ImgRef)
+	log.Infof("building workspace in '%s' with apko", b.GuestDir)
 
-		// TODO(kaniini): Make overlay-binsh work with Docker and Kubernetes.
-		// Probably needs help from apko.
-		if err := b.overlayBinSh(); err != nil {
-			return fmt.Errorf("unable to install overlay /bin/sh: %w", err)
-		}
+	guestFS := apkofs.DirFS(b.GuestDir, apkofs.WithCreateDir())
+	imgRef, err := b.buildGuest(ctx, b.Configuration.Environment, guestFS)
+	if err != nil {
+		return fmt.Errorf("unable to build guest: %w", err)
+	}
 
-		if err := b.Runner.StartPod(ctx, cfg); err != nil {
-			return fmt.Errorf("unable to start pod: %w", err)
-		}
-		if !b.DebugRunner {
-			defer func() {
-				if err := b.Runner.TerminatePod(context.WithoutCancel(ctx), cfg); err != nil {
-					log.Warnf("unable to terminate pod: %s", err)
-				}
-			}()
-		}
+	cfg.ImgRef = imgRef
+	log.Debugf("ImgRef = %s", cfg.ImgRef)
 
-		// run the main pipeline
-		log.Debug("running the main pipeline")
-		pipelines := b.Configuration.Pipeline
-		if err := pr.runPipelines(ctx, pipelines); err != nil {
-			return fmt.Errorf("unable to run package %s pipeline: %w", b.Configuration.Name(), err)
-		}
+	// TODO(kaniini): Make overlay-binsh work with Docker and Kubernetes.
+	// Probably needs help from apko.
+	if err := b.overlayBinSh(); err != nil {
+		return fmt.Errorf("unable to install overlay /bin/sh: %w", err)
+	}
 
-		for i, p := range pipelines {
-			uniqueID := strconv.Itoa(i)
-			pkg, err := p.SBOMPackageForUpstreamSource(b.Configuration.Package.LicenseExpression(), namespace, uniqueID)
-			if err != nil {
-				return fmt.Errorf("creating SBOM package for upstream source: %w", err)
+	if err := b.Runner.StartPod(ctx, cfg); err != nil {
+		return fmt.Errorf("unable to start pod: %w", err)
+	}
+	if !b.DebugRunner {
+		defer func() {
+			if err := b.Runner.TerminatePod(context.WithoutCancel(ctx), cfg); err != nil {
+				log.Warnf("unable to terminate pod: %s", err)
 			}
+		}()
+	}
 
-			if pkg == nil {
-				// This particular pipeline step doesn't tell us about the upstream source code.
-				continue
-			}
+	// run the main pipeline
+	log.Debug("running the main pipeline")
+	pipelines := b.Configuration.Pipeline
+	if err := pr.runPipelines(ctx, pipelines); err != nil {
+		return fmt.Errorf("unable to run package %s pipeline: %w", b.Configuration.Name(), err)
+	}
 
-			b.SBOMGroup.AddUpstreamSourcePackage(pkg)
+	for i, p := range pipelines {
+		uniqueID := strconv.Itoa(i)
+		pkg, err := p.SBOMPackageForUpstreamSource(b.Configuration.Package.LicenseExpression(), namespace, uniqueID)
+		if err != nil {
+			return fmt.Errorf("creating SBOM package for upstream source: %w", err)
 		}
 
-		// add the main package to the linter queue
-		lintTarget := linterTarget{
-			pkgName:  b.Configuration.Package.Name,
-			disabled: b.Configuration.Package.Checks.Disabled,
+		if pkg == nil {
+			// This particular pipeline step doesn't tell us about the upstream source code.
+			continue
 		}
-		linterQueue = append(linterQueue, lintTarget)
+
+		b.SBOMGroup.AddUpstreamSourcePackage(pkg)
+	}
+
+	// add the main package to the linter queue
+	lintTarget := linterTarget{
+		pkgName:  b.Configuration.Package.Name,
+		disabled: b.Configuration.Package.Checks.Disabled,
 	}
+	linterQueue = append(linterQueue, lintTarget)
 
 	// run any pipelines for subpackages
 	for _, sp := range b.Configuration.Subpackages {
@@ -803,14 +794,12 @@ func (b *Build) BuildPackage(ctx context.Context) error {
 			return err
 		}
 
-		if !b.isBuildLess() {
-			log.Infof("running pipeline for subpackage %s", sp.Name)
+		log.Infof("running pipeline for subpackage %s", sp.Name)
 
-			ctx := clog.WithLogger(ctx, log.With("subpackage", sp.Name))
+		ctx := clog.WithLogger(ctx, log.With("subpackage", sp.Name))
 
-			if err := pr.runPipelines(ctx, sp.Pipeline); err != nil {
-				return fmt.Errorf("unable to run subpackage %s pipeline: %w", sp.Name, err)
-			}
+		if err := pr.runPipelines(ctx, sp.Pipeline); err != nil {
+			return fmt.Errorf("unable to run subpackage %s pipeline: %w", sp.Name, err)
 		}
 
 		// add the main package to the linter queue
@@ -952,11 +941,9 @@ func (b *Build) BuildPackage(ctx context.Context) error {
 		log.Warnf("unable to clean workspace: %s", err)
 	}
 
-	if !b.isBuildLess() {
-		// clean build guest container
-		if err := os.RemoveAll(b.GuestDir); err != nil {
-			log.Warnf("unable to clean guest container: %s", err)
-		}
+	// clean build guest container
+	if err := os.RemoveAll(b.GuestDir); err != nil {
+		log.Warnf("unable to clean guest container: %s", err)
 	}
 
 	// generate APKINDEX.tar.gz and sign it
@@ -1075,17 +1062,14 @@ func (b *Build) buildFlavor() string {
 
 func (b *Build) buildWorkspaceConfig(ctx context.Context) *container.Config {
 	log := clog.FromContext(ctx)
-	if b.isBuildLess() {
-		return &container.Config{
-			Arch:         b.Arch,
-			WorkspaceDir: b.WorkspaceDir,
-		}
-	}
 
-	mounts := []container.BindMount{
-		{Source: b.WorkspaceDir, Destination: container.DefaultWorkspaceDir},
-		{Source: "/etc/resolv.conf", Destination: container.DefaultResolvConfPath},
-	}
+	mounts := []container.BindMount{{
+		Source:      b.WorkspaceDir,
+		Destination: container.DefaultWorkspaceDir,
+	}, {
+		Source:      "/etc/resolv.conf",
+		Destination: container.DefaultResolvConfPath,
+	}}
 
 	if b.CacheDir != "" {
 		if fi, err := os.Stat(b.CacheDir); err == nil && fi.IsDir() {