make aws relaseToDist consistent

aws/distributionscanner_test.go

@@ -48,7 +48,7 @@ func TestDistributionScanner(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			scanner := DistributionScanner{}
 			dist := scanner.parse(bytes.NewBuffer(tt.osRelease))
-			cmpDist, _ := releaseToDist(tt.release)
+			cmpDist := releaseToDist(tt.release)
 			if !cmp.Equal(dist, cmpDist) {
 				t.Fatalf("%v", cmp.Diff(dist, cmpDist))
 			}

aws/distributionscannner.go

@@ -92,10 +92,7 @@ func (ds *DistributionScanner) Scan(ctx context.Context, l *claircore.Layer) ([]
 func (ds *DistributionScanner) parse(buff *bytes.Buffer) *claircore.Distribution {
 	for _, ur := range awsRegexes {
 		if ur.regexp.Match(buff.Bytes()) {
-			dist, err := releaseToDist(ur.release)
-			if err != nil {
-				panic("aws distrubution scanner: awsRegex configured with unknown release")
-			}
+			dist := releaseToDist(ur.release)
 			return dist
 		}
 	}

aws/releases.go

@@ -1,8 +1,6 @@
 package aws
 
 import (
-	"fmt"
-
 	"github.com/quay/claircore"
 )
 
@@ -33,13 +31,14 @@ var linux2Dist = &claircore.Distribution{
 	CPE:        "cpe:2.3:o:amazon:amazon_linux:2",
 }
 
-func releaseToDist(release Release) (*claircore.Distribution, error) {
+func releaseToDist(release Release) *claircore.Distribution {
 	switch release {
 	case Linux1:
-		return linux1Dist, nil
+		return linux1Dist
 	case Linux2:
-		return linux2Dist, nil
+		return linux2Dist
 	default:
-		return nil, fmt.Errorf("unknown release")
+		// return empty dist
+		return &claircore.Distribution{}
 	}
 }

aws/updater.go

@@ -73,10 +73,7 @@ func (u *Updater) Parse(ctx context.Context, contents io.ReadCloser) ([]*clairco
 	if err != nil {
 		return nil, fmt.Errorf("failed to unmarshal updates xml: %v", err)
 	}
-	dist, err := releaseToDist(u.release)
-	if err != nil {
-		return nil, fmt.Errorf("failed to classify vulns with distribution: %w", err)
-	}
+	dist := releaseToDist(u.release)
 
 	vulns := []*claircore.Vulnerability{}
 	for _, update := range updates.Updates {