postgres: add handling for Package changes

Signed-off-by: Hank Donnay <hdonnay@redhat.com>
Change-Id: I4e247878b27dc39096aa9379f33c3ed16a6a6964

Author: hdonnay

datastore/postgres/querybuilder.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/quay/claircore"
 	"github.com/quay/claircore/datastore"
+	"github.com/quay/claircore/internal/wart"
 	"github.com/quay/claircore/libvuln/driver"
 )
 
@@ -26,15 +27,15 @@ func buildGetQuery(record *claircore.IndexRecord, opts *datastore.GetOpts) (stri
 	}
 	packageQuery := goqu.And(
 		goqu.Ex{"package_name": record.Package.Name},
-		goqu.Ex{"package_kind": record.Package.Kind},
+		goqu.Ex{"package_kind": wart.StringFromPackageKind(record.Package.Kind)},
 	)
 	exps = append(exps, packageQuery)
 
 	// If the package has a source, convert the first expression to an OR.
 	if record.Package.Source.Name != "" {
 		sourcePackageQuery := goqu.And(
 			goqu.Ex{"package_name": record.Package.Source.Name},
-			goqu.Ex{"package_kind": record.Package.Source.Kind},
+			goqu.Ex{"package_kind": wart.StringFromPackageKind(record.Package.Source.Kind)},
 		)
 		or := goqu.Or(
 			packageQuery,

datastore/postgres/updatevulnerabilities.go

@@ -17,6 +17,7 @@ import (
 
 	"github.com/quay/claircore"
 	"github.com/quay/claircore/datastore"
+	"github.com/quay/claircore/internal/wart"
 	"github.com/quay/claircore/libvuln/driver"
 )
 
@@ -329,7 +330,7 @@ func md5Vuln(v *claircore.Vulnerability) (string, []byte) {
 		b.WriteString(v.Package.Version)
 		b.WriteString(v.Package.Module)
 		b.WriteString(v.Package.Arch)
-		b.WriteString(v.Package.Kind)
+		b.WriteString(wart.StringFromPackageKind(v.Package.Kind))
 	}
 	if v.Dist != nil {
 		b.WriteString(v.Dist.DID)