Revert "fix: add and leverage helper functions for [safely] setting capacity (#2318)" (#2320)

This reverts commit ae3c12f.

This package adds unnecessary noise around a very common operation.

If a melange program actually has anywhere close to `math.MaxInt` values
of anything, we're never going to actually finish executing it, or we'll
run out of memory pretty quickly.

Go is a memory safe language. If you attempt to allocate a slice with
negative capacity, it will panic, which is the only reasonable thing to
do. Attempting to "safely" allocate, instead, `math.MaxInt` of anything
just delays the problem very slightly. If we actually need that
capacity, we're not going to be able to execute the program.

Signed-off-by: Jon Johnson <jon.johnson@chainguard.dev>

Author: jonjohnsonjr

internal/capacity/cap.go

@@ -27,7 +27,6 @@ import (
 	"chainguard.dev/apko/pkg/sbom/generator/spdx"
 	"github.com/spdx/tools-golang/spdx/v2/common"
 
-	"chainguard.dev/melange/internal/capacity"
 	build "chainguard.dev/melange/pkg/build/sbom"
 	"chainguard.dev/melange/pkg/sbom"
 )
@@ -100,7 +99,7 @@ type Generator struct{}
 // It returns a map of package names to their corresponding SPDX documents.
 func (g *Generator) GenerateSPDX(ctx context.Context, gc *build.GeneratorContext) (map[string]spdx.Document, error) {
 	// Collect all package names
-	pkgNames := make([]string, 0, capacity.Add(len(gc.Configuration.Subpackages), 1))
+	pkgNames := make([]string, 0, len(gc.Configuration.Subpackages)+1)
 	pkgNames = append(pkgNames, gc.Configuration.Package.Name)
 	for _, sp := range gc.Configuration.Subpackages {
 		pkgNames = append(pkgNames, sp.Name)

internal/capacity/cap_test.go

@@ -22,7 +22,6 @@ import (
 	"chainguard.dev/apko/pkg/apk/apk"
 	apkofs "chainguard.dev/apko/pkg/apk/fs"
 
-	"chainguard.dev/melange/internal/capacity"
 	"chainguard.dev/melange/pkg/config"
 	"chainguard.dev/melange/pkg/sca"
 )
@@ -42,7 +41,7 @@ func (scabi *SCABuildInterface) PackageName() string {
 // RelativeNames returns all the package names relating to the package being
 // built.
 func (scabi *SCABuildInterface) RelativeNames() []string {
-	targets := make([]string, 0, capacity.Add(len(scabi.PackageBuild.Build.Configuration.Subpackages), 1))
+	targets := make([]string, 0, len(scabi.PackageBuild.Build.Configuration.Subpackages)+1)
 	targets = append(targets, scabi.PackageBuild.Origin.Name)
 
 	for _, target := range scabi.PackageBuild.Build.Configuration.Subpackages {

pkg/build/sbom/spdx/spdx.go

@@ -34,7 +34,6 @@ import (
 	"github.com/spf13/cobra"
 	"go.opentelemetry.io/otel"
 
-	"chainguard.dev/melange/internal/capacity"
 	"chainguard.dev/melange/pkg/build"
 	"chainguard.dev/melange/pkg/config"
 	"chainguard.dev/melange/pkg/sca"
@@ -431,7 +430,7 @@ func (s *scaImpl) PackageName() string {
 }
 
 func (s *scaImpl) RelativeNames() []string {
-	targets := make([]string, 0, capacity.Add(len(s.pb.Build.Configuration.Subpackages), 1))
+	targets := make([]string, 0, len(s.pb.Build.Configuration.Subpackages)+1)
 	targets = append(targets, s.pb.Origin.Name)
 
 	for _, target := range s.pb.Build.Configuration.Subpackages {

pkg/build/sca_interface.go

@@ -29,7 +29,6 @@ import (
 	"go.opentelemetry.io/otel"
 	"golang.org/x/sync/errgroup"
 
-	"chainguard.dev/melange/internal/capacity"
 	"chainguard.dev/melange/pkg/build"
 )
 
@@ -206,7 +205,7 @@ func TestCmd(ctx context.Context, archs []apko_types.Architecture, baseOpts ...b
 	// https://github.com/distroless/nginx/runs/7219233843?check_suite_focus=true
 	bcs := []*build.Test{}
 	for _, arch := range archs {
-		opts := make([]build.TestOption, 0, capacity.Add(len(baseOpts), 1))
+		opts := make([]build.TestOption, 0, len(baseOpts)+1)
 		opts = append(opts, build.WithTestArch(arch))
 		opts = append(opts, baseOpts...)
 

pkg/cli/scan.go

@@ -39,13 +39,13 @@ import (
 	"github.com/github/go-spdx/v2/spdxexp"
 	purl "github.com/package-url/packageurl-go"
 
-	"chainguard.dev/melange/internal/capacity"
 	"chainguard.dev/melange/pkg/sbom"
-	"chainguard.dev/melange/pkg/util"
 
 	"github.com/chainguard-dev/clog"
 	"github.com/joho/godotenv"
 	"gopkg.in/yaml.v3"
+
+	"chainguard.dev/melange/pkg/util"
 )
 
 const (
@@ -1273,7 +1273,7 @@ func buildConfigMap(cfg *Configuration) map[string]string {
 }
 
 func replacerFromMap(with map[string]string) *strings.Replacer {
-	replacements := make([]string, 0, capacity.Mul(len(with), 2))
+	replacements := make([]string, 0, len(with)*2)
 	for k, v := range with {
 		replacements = append(replacements, k, v)
 	}

pkg/cli/test.go

@@ -58,7 +58,6 @@ import (
 	"golang.org/x/crypto/ssh/knownhosts"
 	"golang.org/x/term"
 
-	"chainguard.dev/melange/internal/capacity"
 	"chainguard.dev/melange/internal/logwriter"
 	"chainguard.dev/melange/pkg/license"
 )
@@ -2007,7 +2006,7 @@ func generateBaseInitramfs(ctx context.Context, cfg *Config, initramfsPath, cach
 	}
 
 	// Start with base packages and add any additional packages from environment
-	packages := make([]string, 0, capacity.Add(len(additionalPkgs), 1))
+	packages := make([]string, 0, len(additionalPkgs)+1)
 	packages = append(packages, "microvm-init")
 	packages = append(packages, additionalPkgs...)
 

pkg/config/config.go

@@ -29,7 +29,6 @@ import (
 	"strings"
 	"sync"
 
-	"chainguard.dev/melange/internal/capacity"
 	"chainguard.dev/melange/pkg/config"
 
 	"github.com/chainguard-dev/clog"
@@ -59,7 +58,7 @@ func generateKernelDeps(ctx context.Context, hdl SCAHandle, generated *config.De
 		return err
 	}
 
-	allKernelDirs := make([]string, 0, capacity.Add(len(BootDirs), len(ModuleDirs)))
+	allKernelDirs := make([]string, 0, len(BootDirs)+len(ModuleDirs))
 	allKernelDirs = append(allKernelDirs, BootDirs...)
 	allKernelDirs = append(allKernelDirs, ModuleDirs...)