database: Rename affected type to feature type (for Amazon Linux upda…

…ter)
quay · Apr 11, 2019 · 6617f56 · 6617f56
1 parent adde759
commit 6617f56
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/ext/vulnsrc/amzn/amzn.go b/ext/vulnsrc/amzn/amzn.go
@@ -27,7 +27,6 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
-
 	"github.com/coreos/clair/database"
 	"github.com/coreos/clair/ext/versionfmt"
 	"github.com/coreos/clair/ext/versionfmt/rpm"
@@ -325,7 +324,7 @@ func (u *updater) alasToFeatureVersions(alas ALAS) []database.AffectedFeature {
 			},
 			FeatureName:     p.Name,
 			AffectedVersion: version,
-			AffectedType:    database.AffectBinaryPackage,
+			FeatureType:     database.BinaryPackage,
 		}
 
 		if version != versionfmt.MaxVersion {

diff --git a/ext/vulnsrc/amzn/amzn_test.go b/ext/vulnsrc/amzn/amzn_test.go
@@ -67,7 +67,7 @@ func TestAmazonLinux1(t *testing.T) {
 			FeatureName:     "httpd-devel",
 			AffectedVersion: "2.2.21-1.18.amzn1",
 			FixedInVersion:  "2.2.21-1.18.amzn1",
-			AffectedType:    database.AffectBinaryPackage,
+			FeatureType:     database.BinaryPackage,
 		},
 		{
 			Namespace: database.Namespace{
@@ -77,7 +77,7 @@ func TestAmazonLinux1(t *testing.T) {
 			FeatureName:     "httpd-debuginfo",
 			AffectedVersion: "2.2.21-1.18.amzn1",
 			FixedInVersion:  "2.2.21-1.18.amzn1",
-			AffectedType:    database.AffectBinaryPackage,
+			FeatureType:     database.BinaryPackage,
 		},
 	}
 
@@ -100,7 +100,7 @@ func TestAmazonLinux1(t *testing.T) {
 			FeatureName:     "cyrus-imapd-debuginfo",
 			AffectedVersion: "2.3.16-6.4.amzn1",
 			FixedInVersion:  "2.3.16-6.4.amzn1",
-			AffectedType:    database.AffectBinaryPackage,
+			FeatureType:     database.BinaryPackage,
 		},
 		{
 			Namespace: database.Namespace{
@@ -110,7 +110,7 @@ func TestAmazonLinux1(t *testing.T) {
 			FeatureName:     "cyrus-imapd-utils",
 			AffectedVersion: "2.3.16-6.4.amzn1",
 			FixedInVersion:  "2.3.16-6.4.amzn1",
-			AffectedType:    database.AffectBinaryPackage,
+			FeatureType:     database.BinaryPackage,
 		},
 	}
 
@@ -160,7 +160,7 @@ func TestAmazonLinux2(t *testing.T) {
 			FeatureName:     "kernel",
 			AffectedVersion: "4.9.76-38.79.amzn2",
 			FixedInVersion:  "4.9.76-38.79.amzn2",
-			AffectedType:    database.AffectBinaryPackage,
+			FeatureType:     database.BinaryPackage,
 		},
 		{
 			Namespace: database.Namespace{
@@ -170,7 +170,7 @@ func TestAmazonLinux2(t *testing.T) {
 			FeatureName:     "kernel-headers",
 			AffectedVersion: "4.9.76-38.79.amzn2",
 			FixedInVersion:  "4.9.76-38.79.amzn2",
-			AffectedType:    database.AffectBinaryPackage,
+			FeatureType:     database.BinaryPackage,
 		},
 	}
 
@@ -193,7 +193,7 @@ func TestAmazonLinux2(t *testing.T) {
 			FeatureName:     "qemu-kvm",
 			AffectedVersion: "10:1.5.3-141.amzn2.5.3",
 			FixedInVersion:  "10:1.5.3-141.amzn2.5.3",
-			AffectedType:    database.AffectBinaryPackage,
+			FeatureType:     database.BinaryPackage,
 		},
 		{
 			Namespace: database.Namespace{
@@ -203,7 +203,7 @@ func TestAmazonLinux2(t *testing.T) {
 			FeatureName:     "qemu-img",
 			AffectedVersion: "10:1.5.3-141.amzn2.5.3",
 			FixedInVersion:  "10:1.5.3-141.amzn2.5.3",
-			AffectedType:    database.AffectBinaryPackage,
+			FeatureType:     database.BinaryPackage,
 		},
 	}