Revert: all: account for language package overwrites

This reverts commit ff0aeab.

Signed-off-by: crozzy <joseph.crosland@gmail.com>

Author: crozzy

gobin/coalescer.go

@@ -0,0 +1,45 @@
+package gobin
+
+import (
+	"context"
+	"strings"
+
+	"github.com/quay/claircore"
+	"github.com/quay/claircore/indexer"
+)
+
+type coalescer struct{}
+
+func (c *coalescer) Coalesce(ctx context.Context, ls []*indexer.LayerArtifacts) (*claircore.IndexReport, error) {
+	ir := &claircore.IndexReport{
+		Environments: map[string][]*claircore.Environment{},
+		Packages:     map[string]*claircore.Package{},
+		Repositories: map[string]*claircore.Repository{},
+	}
+	for _, l := range ls {
+		var rid string
+		for _, r := range l.Repos {
+			// Magic strings copied out of the osv package.
+			if r.Name != `go` || r.URI != `https://pkg.go.dev/` {
+				continue
+			}
+			rid = r.ID
+			ir.Repositories[r.ID] = r
+			break
+		}
+		for _, pkg := range l.Pkgs {
+			if !strings.HasPrefix(pkg.PackageDB, "go:") {
+				continue
+			}
+			ir.Packages[pkg.ID] = pkg
+			ir.Environments[pkg.ID] = []*claircore.Environment{
+				{
+					PackageDB:     pkg.PackageDB,
+					IntroducedIn:  l.Hash,
+					RepositoryIDs: []string{rid},
+				},
+			}
+		}
+	}
+	return ir, nil
+}

gobin/ecosystem.go

@@ -4,18 +4,17 @@ import (
 	"context"
 
 	"github.com/quay/claircore/indexer"
-	"github.com/quay/claircore/language"
 )
 
 // NewEcosystem provides the ecosystem for handling go binaries.
-func NewEcosystem(_ context.Context) *indexer.Ecosystem {
+func NewEcosystem(ctx context.Context) *indexer.Ecosystem {
 	return &indexer.Ecosystem{
 		Name: "gobin",
 		PackageScanners: func(context.Context) ([]indexer.PackageScanner, error) {
 			return []indexer.PackageScanner{Detector{}}, nil
 		},
 		DistributionScanners: func(context.Context) ([]indexer.DistributionScanner, error) { return nil, nil },
 		RepositoryScanners:   func(context.Context) ([]indexer.RepositoryScanner, error) { return nil, nil },
-		Coalescer:            language.NewCoalescer,
+		Coalescer:            func(context.Context) (indexer.Coalescer, error) { return &coalescer{}, nil },
 	}
 }

gobin/gobin.go

@@ -34,7 +34,7 @@ type Detector struct{}
 
 const (
 	detectorName    = `gobin`
-	detectorVersion = `8`
+	detectorVersion = `7`
 	detectorKind    = `package`
 )
 

java/coalescer.go

@@ -0,0 +1,42 @@
+package java
+
+import (
+	"context"
+
+	"github.com/quay/claircore"
+	"github.com/quay/claircore/indexer"
+)
+
+type coalescer struct{}
+
+func (*coalescer) Coalesce(ctx context.Context, ls []*indexer.LayerArtifacts) (*claircore.IndexReport, error) {
+	ir := &claircore.IndexReport{
+		Environments: map[string][]*claircore.Environment{},
+		Packages:     map[string]*claircore.Package{},
+		Repositories: map[string]*claircore.Repository{},
+	}
+
+	for _, l := range ls {
+		// If we didn't find at least one maven repo in this layer
+		// no point in searching for packages.
+		if len(l.Repos) == 0 {
+			continue
+		}
+		rs := make([]string, len(l.Repos))
+		for i, r := range l.Repos {
+			rs[i] = r.ID
+			ir.Repositories[r.ID] = r
+		}
+		for _, pkg := range l.Pkgs {
+			ir.Packages[pkg.ID] = pkg
+			ir.Environments[pkg.ID] = []*claircore.Environment{
+				{
+					PackageDB:     pkg.PackageDB,
+					IntroducedIn:  l.Hash,
+					RepositoryIDs: rs,
+				},
+			}
+		}
+	}
+	return ir, nil
+}

java/ecosystem.go

@@ -4,11 +4,10 @@ import (
 	"context"
 
 	"github.com/quay/claircore/indexer"
-	"github.com/quay/claircore/language"
 )
 
 // NewEcosystem provides the set of scanners for the java ecosystem.
-func NewEcosystem(_ context.Context) *indexer.Ecosystem {
+func NewEcosystem(ctx context.Context) *indexer.Ecosystem {
 	return &indexer.Ecosystem{
 		PackageScanners: func(_ context.Context) ([]indexer.PackageScanner, error) {
 			return []indexer.PackageScanner{&Scanner{}}, nil
@@ -17,6 +16,8 @@ func NewEcosystem(_ context.Context) *indexer.Ecosystem {
 		RepositoryScanners: func(_ context.Context) ([]indexer.RepositoryScanner, error) {
 			return nil, nil
 		},
-		Coalescer: language.NewCoalescer,
+		Coalescer: func(_ context.Context) (indexer.Coalescer, error) {
+			return (*coalescer)(nil), nil
+		},
 	}
 }