feat: split apk out of alpine

Refs: #923 Signed-off-by: Johan Bergström <[email protected]>
quay · Sep 24, 2023 · 5afebb5 · 5afebb5
1 parent c5ea100
commit 5afebb5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/alpine/ecosystem.go b/alpine/ecosystem.go
@@ -3,6 +3,7 @@ package alpine
 import (
 	"context"
 
+	"github.com/quay/claircore/apk"
 	"github.com/quay/claircore/indexer"
 	"github.com/quay/claircore/linux"
 )
@@ -11,7 +12,7 @@ import (
 func NewEcosystem(ctx context.Context) *indexer.Ecosystem {
 	return &indexer.Ecosystem{
 		PackageScanners: func(ctx context.Context) ([]indexer.PackageScanner, error) {
-			return []indexer.PackageScanner{&Scanner{}}, nil
+			return []indexer.PackageScanner{&apk.Scanner{}}, nil
 		},
 		DistributionScanners: func(ctx context.Context) ([]indexer.DistributionScanner, error) {
 			return []indexer.DistributionScanner{&DistributionScanner{}}, nil

diff --git a/alpine/packagescanner.go → apk/scanner.go b/alpine/packagescanner.go → apk/scanner.go
@@ -1,4 +1,4 @@
-package alpine
+package apk
 
 import (
 	"bytes"
@@ -15,9 +15,9 @@ import (
 )
 
 const (
-	pkgName    = `apk`
-	pkgVersion = `v0.0.1`
-	pkgKind    = `package`
+	name    = "apk"
+	version = "v0.0.1"
+	kind    = "package"
 )
 
 var (
@@ -31,13 +31,13 @@ var (
 type Scanner struct{}
 
 // Name implements indexer.VersionedScanner.
-func (*Scanner) Name() string { return pkgName }
+func (*Scanner) Name() string { return name }
 
 // Version implements indexer.VersionedScanner.
-func (*Scanner) Version() string { return pkgVersion }
+func (*Scanner) Version() string { return version }
 
 // Kind implements indexer.VersionedScanner.
-func (*Scanner) Kind() string { return pkgKind }
+func (*Scanner) Kind() string { return kind }
 
 const installedFile = "lib/apk/db/installed"
 
@@ -52,8 +52,8 @@ func (*Scanner) Scan(ctx context.Context, layer *claircore.Layer) ([]*claircore.
 	defer trace.StartRegion(ctx, "Scanner.Scan").End()
 	trace.Log(ctx, "layer", layer.Hash.String())
 	ctx = zlog.ContextWithValues(ctx,
-		"component", "alpine/Scanner.Scan",
-		"version", pkgVersion,
+		"component", "apk/Scanner.Scan",
+		"version", version,
 		"layer", layer.Hash.String())
 
 	zlog.Debug(ctx).Msg("start")

diff --git a/alpine/packagescanner_test.go → apk/scanner_test.go b/alpine/packagescanner_test.go → apk/scanner_test.go
@@ -1,4 +1,4 @@
-package alpine
+package apk
 
 import (
 	"context"