versionfmt: convert to using constant over literal

quay · Jan 3, 2017 · 8d29bf8 · 8d29bf8
1 parent ebd0170
commit 8d29bf8
Show file tree

Hide file tree

Showing 28 changed files with 142 additions and 169 deletions.
diff --git a/database/pgsql/complex_test.go b/database/pgsql/complex_test.go
@@ -27,11 +27,9 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/coreos/clair/database"
+	"github.com/coreos/clair/ext/versionfmt/dpkg"
 	"github.com/coreos/clair/utils"
 	"github.com/coreos/clair/utils/types"
-
-	// dpkg versioning is used to parse test packages.
-	_ "github.com/coreos/clair/ext/versionfmt/dpkg"
 )
 
 const (
@@ -51,7 +49,7 @@ func TestRaceAffects(t *testing.T) {
 	feature := database.Feature{
 		Namespace: database.Namespace{
 			Name:          "TestRaceAffectsFeatureNamespace1",
-			VersionFormat: "dpkg",
+			VersionFormat: dpkg.ParserName,
 		},
 		Name: "TestRaceAffecturesFeature1",
 	}

diff --git a/database/pgsql/feature.go b/database/pgsql/feature.go
@@ -16,7 +16,6 @@ package pgsql
 
 import (
 	"database/sql"
-	"fmt"
 	"strings"
 	"time"
 
@@ -66,7 +65,6 @@ func (pgSQL *pgSQL) insertFeature(feature database.Feature) (int, error) {
 func (pgSQL *pgSQL) insertFeatureVersion(fv database.FeatureVersion) (id int, err error) {
 	err = versionfmt.Valid(fv.Feature.Namespace.VersionFormat, fv.Version)
 	if err != nil {
-		fmt.Println(err)
 		return 0, cerrors.NewBadRequestError("could not find/insert invalid FeatureVersion")
 	}
 
@@ -205,7 +203,7 @@ func linkFeatureVersionToVulnerabilities(tx *sql.Tx, featureVersion database.Fea
 	// TODO(Quentin-M): LIMIT
 	rows, err := tx.Query(searchVulnerabilityFixedInFeature, featureVersion.Feature.ID)
 	if err != nil {
-		return handleError("searchVulnerabilityFixedInFeature", err)
+		return err
 	}
 	defer rows.Close()
 

diff --git a/database/pgsql/feature_test.go b/database/pgsql/feature_test.go
@@ -20,9 +20,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/coreos/clair/database"
-
-	// dpkg versioning is used to parse test packages.
-	_ "github.com/coreos/clair/ext/versionfmt/dpkg"
+	"github.com/coreos/clair/ext/versionfmt/dpkg"
 )
 
 func TestInsertFeature(t *testing.T) {
@@ -49,7 +47,7 @@ func TestInsertFeature(t *testing.T) {
 	feature := database.Feature{
 		Namespace: database.Namespace{
 			Name:          "TestInsertFeatureNamespace1",
-			VersionFormat: "dpkg",
+			VersionFormat: dpkg.ParserName,
 		},
 		Name: "TestInsertFeature1",
 	}
@@ -76,7 +74,7 @@ func TestInsertFeature(t *testing.T) {
 			Feature: database.Feature{
 				Namespace: database.Namespace{
 					Name:          "TestInsertFeatureNamespace2",
-					VersionFormat: "dpkg",
+					VersionFormat: dpkg.ParserName,
 				},
 				Name: "TestInsertFeature2",
 			},
@@ -86,7 +84,7 @@ func TestInsertFeature(t *testing.T) {
 			Feature: database.Feature{
 				Namespace: database.Namespace{
 					Name:          "TestInsertFeatureNamespace2",
-					VersionFormat: "dpkg",
+					VersionFormat: dpkg.ParserName,
 				},
 				Name: "TestInsertFeature2",
 			},
@@ -103,7 +101,7 @@ func TestInsertFeature(t *testing.T) {
 		Feature: database.Feature{
 			Namespace: database.Namespace{
 				Name:          "TestInsertFeatureNamespace1",
-				VersionFormat: "dpkg",
+				VersionFormat: dpkg.ParserName,
 			},
 			Name: "TestInsertFeature1",
 		},

diff --git a/database/pgsql/layer_test.go b/database/pgsql/layer_test.go
@@ -21,11 +21,9 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/coreos/clair/database"
+	"github.com/coreos/clair/ext/versionfmt/dpkg"
 	cerrors "github.com/coreos/clair/utils/errors"
 	"github.com/coreos/clair/utils/types"
-
-	// dpkg versioning is used to parse test packages.
-	_ "github.com/coreos/clair/ext/versionfmt/dpkg"
 )
 
 func TestFindLayer(t *testing.T) {
@@ -144,7 +142,7 @@ func testInsertLayerTree(t *testing.T, datastore database.Datastore) {
 		Feature: database.Feature{
 			Namespace: database.Namespace{
 				Name:          "TestInsertLayerNamespace2",
-				VersionFormat: "dpkg",
+				VersionFormat: dpkg.ParserName,
 			},
 			Name: "TestInsertLayerFeature1",
 		},
@@ -154,7 +152,7 @@ func testInsertLayerTree(t *testing.T, datastore database.Datastore) {
 		Feature: database.Feature{
 			Namespace: database.Namespace{
 				Name:          "TestInsertLayerNamespace2",
-				VersionFormat: "dpkg",
+				VersionFormat: dpkg.ParserName,
 			},
 			Name: "TestInsertLayerFeature2",
 		},
@@ -164,7 +162,7 @@ func testInsertLayerTree(t *testing.T, datastore database.Datastore) {
 		Feature: database.Feature{
 			Namespace: database.Namespace{
 				Name:          "TestInsertLayerNamespace2",
-				VersionFormat: "dpkg",
+				VersionFormat: dpkg.ParserName,
 			},
 			Name: "TestInsertLayerFeature3",
 		},
@@ -174,7 +172,7 @@ func testInsertLayerTree(t *testing.T, datastore database.Datastore) {
 		Feature: database.Feature{
 			Namespace: database.Namespace{
 				Name:          "TestInsertLayerNamespace3",
-				VersionFormat: "dpkg",
+				VersionFormat: dpkg.ParserName,
 			},
 			Name: "TestInsertLayerFeature2",
 		},
@@ -184,7 +182,7 @@ func testInsertLayerTree(t *testing.T, datastore database.Datastore) {
 		Feature: database.Feature{
 			Namespace: database.Namespace{
 				Name:          "TestInsertLayerNamespace3",
-				VersionFormat: "dpkg",
+				VersionFormat: dpkg.ParserName,
 			},
 			Name: "TestInsertLayerFeature3",
 		},
@@ -194,7 +192,7 @@ func testInsertLayerTree(t *testing.T, datastore database.Datastore) {
 		Feature: database.Feature{
 			Namespace: database.Namespace{
 				Name:          "TestInsertLayerNamespace3",
-				VersionFormat: "dpkg",
+				VersionFormat: dpkg.ParserName,
 			},
 			Name: "TestInsertLayerFeature4",
 		},
@@ -210,7 +208,7 @@ func testInsertLayerTree(t *testing.T, datastore database.Datastore) {
 			Parent: &database.Layer{Name: "TestInsertLayer1"},
 			Namespace: &database.Namespace{
 				Name:          "TestInsertLayerNamespace1",
-				VersionFormat: "dpkg",
+				VersionFormat: dpkg.ParserName,
 			},
 		},
 		// This layer changes the namespace and adds Features.
@@ -219,7 +217,7 @@ func testInsertLayerTree(t *testing.T, datastore database.Datastore) {
 			Parent: &database.Layer{Name: "TestInsertLayer2"},
 			Namespace: &database.Namespace{
 				Name:          "TestInsertLayerNamespace2",
-				VersionFormat: "dpkg",
+				VersionFormat: dpkg.ParserName,
 			},
 			Features: []database.FeatureVersion{f1, f2, f3},
 		},
@@ -237,7 +235,7 @@ func testInsertLayerTree(t *testing.T, datastore database.Datastore) {
 			Parent: &database.Layer{Name: "TestInsertLayer3"},
 			Namespace: &database.Namespace{
 				Name:          "TestInsertLayerNamespace3",
-				VersionFormat: "dpkg",
+				VersionFormat: dpkg.ParserName,
 			},
 			Features: []database.FeatureVersion{
 				// Deletes TestInsertLayerFeature1.
@@ -295,7 +293,7 @@ func testInsertLayerUpdate(t *testing.T, datastore database.Datastore) {
 		Feature: database.Feature{
 			Namespace: database.Namespace{
 				Name:          "TestInsertLayerNamespace3",
-				VersionFormat: "dpkg",
+				VersionFormat: dpkg.ParserName,
 			},
 			Name: "TestInsertLayerFeature7",
 		},
@@ -308,7 +306,7 @@ func testInsertLayerUpdate(t *testing.T, datastore database.Datastore) {
 		Parent: l3.Parent,
 		Namespace: &database.Namespace{
 			Name:          "TestInsertLayerNamespaceUpdated1",
-			VersionFormat: "dpkg",
+			VersionFormat: dpkg.ParserName,
 		},
 		Features: []database.FeatureVersion{f7},
 	}

diff --git a/database/pgsql/namespace_test.go b/database/pgsql/namespace_test.go
@@ -21,9 +21,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/coreos/clair/database"
-
-	// dpkg versioning is used to parse test packages.
-	_ "github.com/coreos/clair/ext/versionfmt/dpkg"
+	"github.com/coreos/clair/ext/versionfmt/dpkg"
 )
 
 func TestInsertNamespace(t *testing.T) {
@@ -42,12 +40,12 @@ func TestInsertNamespace(t *testing.T) {
 	// Insert Namespace and ensure we can find it.
 	id1, err := datastore.insertNamespace(database.Namespace{
 		Name:          "TestInsertNamespace1",
-		VersionFormat: "dpkg",
+		VersionFormat: dpkg.ParserName,
 	})
 	assert.Nil(t, err)
 	id2, err := datastore.insertNamespace(database.Namespace{
 		Name:          "TestInsertNamespace1",
-		VersionFormat: "dpkg",
+		VersionFormat: dpkg.ParserName,
 	})
 	assert.Nil(t, err)
 	assert.Equal(t, id1, id2)

diff --git a/database/pgsql/notification_test.go b/database/pgsql/notification_test.go
@@ -22,11 +22,9 @@ import (
 
 	"github.com/coreos/clair/database"
 	"github.com/coreos/clair/ext/versionfmt"
+	"github.com/coreos/clair/ext/versionfmt/dpkg"
 	cerrors "github.com/coreos/clair/utils/errors"
 	"github.com/coreos/clair/utils/types"
-
-	// dpkg versioning is used to parse test packages.
-	_ "github.com/coreos/clair/ext/versionfmt/dpkg"
 )
 
 func TestNotification(t *testing.T) {
@@ -46,15 +44,15 @@ func TestNotification(t *testing.T) {
 		Name: "TestNotificationFeature1",
 		Namespace: database.Namespace{
 			Name:          "TestNotificationNamespace1",
-			VersionFormat: "dpkg",
+			VersionFormat: dpkg.ParserName,
 		},
 	}
 
 	f2 := database.Feature{
 		Name: "TestNotificationFeature2",
 		Namespace: database.Namespace{
 			Name:          "TestNotificationNamespace1",
-			VersionFormat: "dpkg",
+			VersionFormat: dpkg.ParserName,
 		},
 	}
 

diff --git a/database/pgsql/vulnerability_test.go b/database/pgsql/vulnerability_test.go
@@ -22,11 +22,9 @@ import (
 
 	"github.com/coreos/clair/database"
 	"github.com/coreos/clair/ext/versionfmt"
+	"github.com/coreos/clair/ext/versionfmt/dpkg"
 	cerrors "github.com/coreos/clair/utils/errors"
 	"github.com/coreos/clair/utils/types"
-
-	// dpkg versioning is used to parse test packages.
-	_ "github.com/coreos/clair/ext/versionfmt/dpkg"
 )
 
 func TestFindVulnerability(t *testing.T) {
@@ -49,7 +47,7 @@ func TestFindVulnerability(t *testing.T) {
 		Severity:    types.High,
 		Namespace: database.Namespace{
 			Name:          "debian:7",
-			VersionFormat: "dpkg",
+			VersionFormat: dpkg.ParserName,
 		},
 		FixedIn: []database.FeatureVersion{
 			{
@@ -74,7 +72,7 @@ func TestFindVulnerability(t *testing.T) {
 		Description: "A vulnerability affecting nothing",
 		Namespace: database.Namespace{
 			Name:          "debian:7",
-			VersionFormat: "dpkg",
+			VersionFormat: dpkg.ParserName,
 		},
 		Severity: types.Unknown,
 	}
@@ -118,11 +116,11 @@ func TestInsertVulnerability(t *testing.T) {
 	// Create some data.
 	n1 := database.Namespace{
 		Name:          "TestInsertVulnerabilityNamespace1",
-		VersionFormat: "dpkg",
+		VersionFormat: dpkg.ParserName,
 	}
 	n2 := database.Namespace{
 		Name:          "TestInsertVulnerabilityNamespace2",
-		VersionFormat: "dpkg",
+		VersionFormat: dpkg.ParserName,
 	}
 
 	f1 := database.FeatureVersion{

diff --git a/ext/versionfmt/dpkg/parser.go b/ext/versionfmt/dpkg/parser.go
@@ -23,6 +23,9 @@ import (
 	"github.com/coreos/clair/ext/versionfmt"
 )
 
+// ParserName is the name by which the dpkg parser is registered.
+const ParserName = "dpkg"
+
 type version struct {
 	epoch    int
 	version  string
@@ -278,5 +281,5 @@ func signum(a int) int {
 }
 
 func init() {
-	versionfmt.RegisterParser("dpkg", parser{})
+	versionfmt.RegisterParser(ParserName, parser{})
 }
diff --git a/ext/versionfmt/driver.go b/ext/versionfmt/driver.go
@@ -27,7 +27,7 @@ const (
 	// MinVersion is a special package version which is always sorted first.
 	MinVersion = "#MINV#"
 
-	// MaxVersion is a special package version which is always sorted last
+	// MaxVersion is a special package version which is always sorted last.
 	MaxVersion = "#MAXV#"
 )
 

diff --git a/ext/versionfmt/rpm/parser.go b/ext/versionfmt/rpm/parser.go
@@ -25,6 +25,9 @@ import (
 	"github.com/coreos/clair/ext/versionfmt"
 )
 
+// ParserName is the name by which the rpm parser is registered.
+const ParserName = "rpm"
+
 var (
 	// alphanumPattern is a regular expression to match all sequences of numeric
 	// characters or alphanumeric characters.
@@ -273,5 +276,5 @@ func containsRune(s []rune, e rune) bool {
 }
 
 func init() {
-	versionfmt.RegisterParser("rpm", parser{})
+	versionfmt.RegisterParser(ParserName, parser{})
 }