fix lint (again)

Author: jess-lowe

vulnfeeds/cmd/combine-to-osv/main_test.go

@@ -1,14 +1,14 @@
 package main
 
 import (
-	"github.com/google/osv/vulnfeeds/models"
 	"path/filepath"
 	"sort"
 	"testing"
 	"time"
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
+	"github.com/google/osv/vulnfeeds/models"
 	"github.com/ossf/osv-schema/bindings/go/osvschema"
 	"google.golang.org/protobuf/testing/protocmp"
 	"google.golang.org/protobuf/types/known/timestamppb"

vulnfeeds/cmd/converters/cve/nvd-cve-osv/main.go

@@ -24,10 +24,6 @@ var ErrNoRanges = errors.New("no ranges")
 
 var ErrUnresolvedFix = errors.New("fixes not resolved to commits")
 
-const (
-	extension = ".json"
-)
-
 var (
 	jsonPath            = flag.String("nvd-json", "", "Path to NVD CVE JSON to examine.")
 	parsedCPEDictionary = flag.String("cpe-repos", "", "Path to JSON mapping of CPEs to repos generated by cpe-repo-gen")

vulnfeeds/cmd/converters/debian/main_test.go

@@ -3,13 +3,13 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/google/osv/vulnfeeds/models"
 	"os"
 	"sort"
 	"testing"
 	"time"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/google/osv/vulnfeeds/models"
 	"github.com/google/osv/vulnfeeds/vulns"
 	"github.com/ossf/osv-schema/bindings/go/osvschema"
 	"google.golang.org/protobuf/testing/protocmp"

vulnfeeds/conversion/common.go

@@ -1,3 +1,5 @@
+// Package conversion implements common utilities for converting vulnerability data
+// from various sources into the OSV schema.
 package conversion
 
 import (

vulnfeeds/conversion/nvd/converter.go

@@ -1,3 +1,4 @@
+// Package nvd converts NVD CVEs to OSV format.
 package nvd
 
 import (

vulnfeeds/cves/versions.go

@@ -4,14 +4,15 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     https://www.apache.org/licenses/LICENSE-2.0
+//	https://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// Package cves provides utilities for working with CVEs and version information.
 package cves
 
 import (

vulnfeeds/models/cve.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package cves contains CVE-specific data structures.
+// Package models contains CVE-specific data structures.
 package models
 
 import (

vulnfeeds/pypi/pypi.go

@@ -17,7 +17,6 @@ package pypi
 
 import (
 	"encoding/json"
-	"github.com/google/osv/vulnfeeds/models"
 	"log"
 	"log/slog"
 	"net/http"
@@ -28,8 +27,8 @@ import (
 	"strings"
 
 	version "github.com/aquasecurity/go-pep440-version"
-
 	"github.com/google/osv/vulnfeeds/cves"
+	"github.com/google/osv/vulnfeeds/models"
 	"github.com/google/osv/vulnfeeds/triage"
 	"github.com/google/osv/vulnfeeds/utility/logger"
 )