feat!: upgrade to kin-openapi 0.127

kin-openapi has breaking changes to a number of underlying structs
snyk · Aug 16, 2024 · 0c7693b · 0c7693b
1 parent 5f9da9b
commit 0c7693b
Show file tree

Hide file tree

Showing 74 changed files with 153 additions and 153 deletions.
diff --git a/cmd/vervet/main.go b/cmd/vervet/main.go
@@ -4,7 +4,7 @@ import (
 	"log"
 	"os"
 
-	"github.com/snyk/vervet/v7/internal/cmd"
+	"github.com/snyk/vervet/v8/internal/cmd"
 )
 
 func main() {

diff --git a/cmd/vu-api/main.go b/cmd/vu-api/main.go
@@ -15,12 +15,12 @@ import (
 	"github.com/rs/zerolog/log"
 	"golang.org/x/sync/errgroup"
 
-	"github.com/snyk/vervet/v7/config"
-	"github.com/snyk/vervet/v7/internal/handler"
-	"github.com/snyk/vervet/v7/internal/storage"
-	"github.com/snyk/vervet/v7/internal/storage/disk"
-	"github.com/snyk/vervet/v7/internal/storage/gcs"
-	"github.com/snyk/vervet/v7/internal/storage/s3"
+	"github.com/snyk/vervet/v8/config"
+	"github.com/snyk/vervet/v8/internal/handler"
+	"github.com/snyk/vervet/v8/internal/storage"
+	"github.com/snyk/vervet/v8/internal/storage/disk"
+	"github.com/snyk/vervet/v8/internal/storage/gcs"
+	"github.com/snyk/vervet/v8/internal/storage/s3"
 )
 
 func main() {

diff --git a/cmd/vu-scraper/main.go b/cmd/vu-scraper/main.go
@@ -11,12 +11,12 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 
-	"github.com/snyk/vervet/v7/config"
-	"github.com/snyk/vervet/v7/internal/scraper"
-	"github.com/snyk/vervet/v7/internal/storage"
-	"github.com/snyk/vervet/v7/internal/storage/disk"
-	"github.com/snyk/vervet/v7/internal/storage/gcs"
-	"github.com/snyk/vervet/v7/internal/storage/s3"
+	"github.com/snyk/vervet/v8/config"
+	"github.com/snyk/vervet/v8/internal/scraper"
+	"github.com/snyk/vervet/v8/internal/storage"
+	"github.com/snyk/vervet/v8/internal/storage/disk"
+	"github.com/snyk/vervet/v8/internal/storage/gcs"
+	"github.com/snyk/vervet/v8/internal/storage/s3"
 )
 
 func main() {

diff --git a/collator_test.go b/collator_test.go
@@ -5,8 +5,8 @@ import (
 
 	qt "github.com/frankban/quicktest"
 
-	"github.com/snyk/vervet/v7"
-	"github.com/snyk/vervet/v7/testdata"
+	"github.com/snyk/vervet/v8"
+	"github.com/snyk/vervet/v8/testdata"
 )
 
 func TestRefRemover(t *testing.T) {

diff --git a/config/config_test.go b/config/config_test.go
@@ -6,7 +6,7 @@ import (
 
 	qt "github.com/frankban/quicktest"
 
-	"github.com/snyk/vervet/v7/config"
+	"github.com/snyk/vervet/v8/config"
 )
 
 func TestLoad(t *testing.T) {

diff --git a/config/underground.go b/config/underground.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/spf13/viper"
 
-	"github.com/snyk/vervet/v7"
+	"github.com/snyk/vervet/v8"
 )
 
 // StorageType describes backend implementations supported by Vervet Underground.

diff --git a/config/underground_test.go b/config/underground_test.go
@@ -6,8 +6,8 @@ import (
 
 	qt "github.com/frankban/quicktest"
 
-	"github.com/snyk/vervet/v7"
-	"github.com/snyk/vervet/v7/config"
+	"github.com/snyk/vervet/v8"
+	"github.com/snyk/vervet/v8/config"
 )
 
 func createTestFile(c *qt.C, data []byte) *os.File {

diff --git a/document_test.go b/document_test.go
@@ -6,8 +6,8 @@ import (
 
 	qt "github.com/frankban/quicktest"
 
-	"github.com/snyk/vervet/v7"
-	"github.com/snyk/vervet/v7/testdata"
+	"github.com/snyk/vervet/v8"
+	"github.com/snyk/vervet/v8/testdata"
 )
 
 func TestNewDocumentFile(t *testing.T) {

diff --git a/generate/generate.go b/generate/generate.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/snyk/vervet/v7/config"
-	"github.com/snyk/vervet/v7/internal/generator"
+	"github.com/snyk/vervet/v8/config"
+	"github.com/snyk/vervet/v8/internal/generator"
 )
 
 // GeneratorParams contains the metadata needed to execute code generators.

diff --git a/generate/generate_test.go b/generate/generate_test.go
@@ -8,8 +8,8 @@ import (
 
 	qt "github.com/frankban/quicktest"
 
-	"github.com/snyk/vervet/v7/generate"
-	"github.com/snyk/vervet/v7/testdata"
+	"github.com/snyk/vervet/v8/generate"
+	"github.com/snyk/vervet/v8/testdata"
 )
 
 func TestGenerateFS(t *testing.T) {

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/snyk/vervet/v7
+module github.com/snyk/vervet/v8
 
 go 1.22
 

diff --git a/include_headers_test.go b/include_headers_test.go
@@ -6,8 +6,8 @@ import (
 
 	qt "github.com/frankban/quicktest"
 
-	"github.com/snyk/vervet/v7"
-	"github.com/snyk/vervet/v7/testdata"
+	"github.com/snyk/vervet/v8"
+	"github.com/snyk/vervet/v8/testdata"
 )
 
 func TestCommonResponseHeaders(t *testing.T) {

diff --git a/inliner.go b/inliner.go
@@ -3,7 +3,7 @@ package vervet
 import (
 	"github.com/getkin/kin-openapi/openapi3"
 
-	"github.com/snyk/vervet/v7/internal/openapiwalker"
+	"github.com/snyk/vervet/v8/internal/openapiwalker"
 )
 
 // Inliner inlines the component.

diff --git a/internal/backstage/backstage.go b/internal/backstage/backstage.go
@@ -16,7 +16,7 @@ import (
 	"github.com/vmware-labs/yaml-jsonpath/pkg/yamlpath"
 	"gopkg.in/yaml.v3"
 
-	"github.com/snyk/vervet/v7"
+	"github.com/snyk/vervet/v8"
 )
 
 const (

diff --git a/internal/backstage/backstage_test.go b/internal/backstage/backstage_test.go
@@ -7,7 +7,7 @@ import (
 
 	qt "github.com/frankban/quicktest"
 
-	"github.com/snyk/vervet/v7/testdata"
+	"github.com/snyk/vervet/v8/testdata"
 )
 
 func TestBackstageName(t *testing.T) {

diff --git a/internal/cmd/backstage.go b/internal/cmd/backstage.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/urfave/cli/v2"
 
-	"github.com/snyk/vervet/v7/config"
-	"github.com/snyk/vervet/v7/internal/backstage"
+	"github.com/snyk/vervet/v8/config"
+	"github.com/snyk/vervet/v8/internal/backstage"
 )
 
 // BackstageCommand is the `vervet backstage` subcommand.

diff --git a/internal/cmd/compiler.go b/internal/cmd/compiler.go
@@ -6,10 +6,10 @@ import (
 
 	"github.com/urfave/cli/v2"
 
-	"github.com/snyk/vervet/v7"
-	"github.com/snyk/vervet/v7/config"
-	"github.com/snyk/vervet/v7/internal/compiler"
-	"github.com/snyk/vervet/v7/internal/simplebuild"
+	"github.com/snyk/vervet/v8"
+	"github.com/snyk/vervet/v8/config"
+	"github.com/snyk/vervet/v8/internal/compiler"
+	"github.com/snyk/vervet/v8/internal/simplebuild"
 )
 
 var defaultPivotDate = vervet.MustParseVersion("2024-09-01")

diff --git a/internal/cmd/compiler_test.go b/internal/cmd/compiler_test.go
@@ -8,9 +8,9 @@ import (
 	qt "github.com/frankban/quicktest"
 	"github.com/getkin/kin-openapi/openapi3"
 
-	"github.com/snyk/vervet/v7"
-	"github.com/snyk/vervet/v7/internal/cmd"
-	"github.com/snyk/vervet/v7/testdata"
+	"github.com/snyk/vervet/v8"
+	"github.com/snyk/vervet/v8/internal/cmd"
+	"github.com/snyk/vervet/v8/testdata"
 )
 
 var specFile = "/spec.yaml"

diff --git a/internal/cmd/filter.go b/internal/cmd/filter.go
@@ -6,7 +6,7 @@ import (
 	"github.com/getkin/kin-openapi/openapi3"
 	"github.com/urfave/cli/v2"
 
-	"github.com/snyk/vervet/v7"
+	"github.com/snyk/vervet/v8"
 )
 
 // FilterCommand is the `vervet filter` subcommand.

diff --git a/internal/cmd/filter_test.go b/internal/cmd/filter_test.go
@@ -6,9 +6,9 @@ import (
 
 	qt "github.com/frankban/quicktest"
 
-	"github.com/snyk/vervet/v7"
-	"github.com/snyk/vervet/v7/internal/cmd"
-	"github.com/snyk/vervet/v7/testdata"
+	"github.com/snyk/vervet/v8"
+	"github.com/snyk/vervet/v8/internal/cmd"
+	"github.com/snyk/vervet/v8/testdata"
 )
 
 func TestFilterInclude(t *testing.T) {

diff --git a/internal/cmd/generate.go b/internal/cmd/generate.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/urfave/cli/v2"
 
-	"github.com/snyk/vervet/v7/generate"
+	"github.com/snyk/vervet/v8/generate"
 )
 
 // GenerateCommand is the `vervet generate` subcommand.

diff --git a/internal/cmd/localize.go b/internal/cmd/localize.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/urfave/cli/v2"
 
-	"github.com/snyk/vervet/v7"
+	"github.com/snyk/vervet/v8"
 )
 
 // LocalizeCommand is the `vervet localize` subcommand.

diff --git a/internal/cmd/resolve.go b/internal/cmd/resolve.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/urfave/cli/v2"
 
-	"github.com/snyk/vervet/v7"
+	"github.com/snyk/vervet/v8"
 )
 
 // ResolveCommand is the `vervet resolve` subcommand.

diff --git a/internal/cmd/resource.go b/internal/cmd/resource.go
@@ -9,9 +9,9 @@ import (
 	"github.com/olekukonko/tablewriter"
 	"github.com/urfave/cli/v2"
 
-	"github.com/snyk/vervet/v7"
-	"github.com/snyk/vervet/v7/config"
-	"github.com/snyk/vervet/v7/internal/compiler"
+	"github.com/snyk/vervet/v8"
+	"github.com/snyk/vervet/v8/config"
+	"github.com/snyk/vervet/v8/internal/compiler"
 )
 
 // ResourceCommand is the `vervet resource` subcommand.

diff --git a/internal/cmd/resource_test.go b/internal/cmd/resource_test.go
@@ -7,8 +7,8 @@ import (
 
 	qt "github.com/frankban/quicktest"
 
-	"github.com/snyk/vervet/v7/internal/cmd"
-	"github.com/snyk/vervet/v7/testdata"
+	"github.com/snyk/vervet/v8/internal/cmd"
+	"github.com/snyk/vervet/v8/testdata"
 )
 
 func cd(c *qt.C, path string) {

diff --git a/internal/cmd/scaffold.go b/internal/cmd/scaffold.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/urfave/cli/v2"
 
-	"github.com/snyk/vervet/v7/internal/scaffold"
+	"github.com/snyk/vervet/v8/internal/scaffold"
 )
 
 // Scaffold is the `vervet scaffold` subcommand.

diff --git a/internal/cmd/scaffold_test.go b/internal/cmd/scaffold_test.go
@@ -8,8 +8,8 @@ import (
 	qt "github.com/frankban/quicktest"
 	"github.com/urfave/cli/v2"
 
-	"github.com/snyk/vervet/v7/internal/cmd"
-	"github.com/snyk/vervet/v7/testdata"
+	"github.com/snyk/vervet/v8/internal/cmd"
+	"github.com/snyk/vervet/v8/testdata"
 )
 
 var vervetConfigFile = "./.vervet.yaml"

diff --git a/internal/compiler/compiler.go b/internal/compiler/compiler.go
@@ -13,9 +13,9 @@ import (
 	"github.com/ghodss/yaml"
 	"go.uber.org/multierr"
 
-	"github.com/snyk/vervet/v7"
-	"github.com/snyk/vervet/v7/config"
-	"github.com/snyk/vervet/v7/internal/files"
+	"github.com/snyk/vervet/v8"
+	"github.com/snyk/vervet/v8/config"
+	"github.com/snyk/vervet/v8/internal/files"
 )
 
 // A Compiler checks and builds versioned API resource inputs into aggregated

diff --git a/internal/compiler/compiler_test.go b/internal/compiler/compiler_test.go
@@ -11,9 +11,9 @@ import (
 
 	qt "github.com/frankban/quicktest"
 
-	"github.com/snyk/vervet/v7"
-	"github.com/snyk/vervet/v7/config"
-	"github.com/snyk/vervet/v7/testdata"
+	"github.com/snyk/vervet/v8"
+	"github.com/snyk/vervet/v8/config"
+	"github.com/snyk/vervet/v8/testdata"
 )
 
 func setup(c *qt.C) {

diff --git a/internal/files/files.go b/internal/files/files.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/bmatcuk/doublestar/v4"
 
-	"github.com/snyk/vervet/v7"
-	"github.com/snyk/vervet/v7/config"
+	"github.com/snyk/vervet/v8"
+	"github.com/snyk/vervet/v8/config"
 )
 
 // FileSource defines a source of spec files to lint. This abstraction allows

diff --git a/internal/generator/generator.go b/internal/generator/generator.go
@@ -13,8 +13,8 @@ import (
 
 	"github.com/ghodss/yaml"
 
-	"github.com/snyk/vervet/v7"
-	"github.com/snyk/vervet/v7/config"
+	"github.com/snyk/vervet/v8"
+	"github.com/snyk/vervet/v8/config"
 )
 
 // Generator generates files for new resources from data models and templates.

diff --git a/internal/generator/generator_test.go b/internal/generator/generator_test.go
@@ -9,8 +9,8 @@ import (
 
 	qt "github.com/frankban/quicktest"
 
-	"github.com/snyk/vervet/v7/config"
-	"github.com/snyk/vervet/v7/testdata"
+	"github.com/snyk/vervet/v8/config"
+	"github.com/snyk/vervet/v8/testdata"
 )
 
 func setup(c *qt.C) {

diff --git a/internal/generator/resources.go b/internal/generator/resources.go
@@ -5,9 +5,9 @@ import (
 
 	"github.com/getkin/kin-openapi/openapi3"
 
-	"github.com/snyk/vervet/v7"
-	"github.com/snyk/vervet/v7/config"
-	"github.com/snyk/vervet/v7/internal/compiler"
+	"github.com/snyk/vervet/v8"
+	"github.com/snyk/vervet/v8/config"
+	"github.com/snyk/vervet/v8/internal/compiler"
 )
 
 // ResourceKey uniquely identifies an API resource.

diff --git a/internal/handler/handler.go b/internal/handler/handler.go
@@ -16,10 +16,10 @@ import (
 	prommiddleware "github.com/slok/go-http-metrics/middleware"
 	prommiddlewarestd "github.com/slok/go-http-metrics/middleware/std"
 
-	"github.com/snyk/vervet/v7"
-	"github.com/snyk/vervet/v7/config"
-	"github.com/snyk/vervet/v7/internal/storage"
-	"github.com/snyk/vervet/v7/versionware"
+	"github.com/snyk/vervet/v8"
+	"github.com/snyk/vervet/v8/config"
+	"github.com/snyk/vervet/v8/internal/storage"
+	"github.com/snyk/vervet/v8/versionware"
 )
 
 // Handler handles Vervet Underground HTTP requests.

diff --git a/internal/handler/handler_test.go b/internal/handler/handler_test.go
@@ -9,9 +9,9 @@ import (
 
 	qt "github.com/frankban/quicktest"
 
-	"github.com/snyk/vervet/v7"
-	"github.com/snyk/vervet/v7/config"
-	"github.com/snyk/vervet/v7/internal/handler"
+	"github.com/snyk/vervet/v8"
+	"github.com/snyk/vervet/v8/config"
+	"github.com/snyk/vervet/v8/internal/handler"
 )
 
 func TestHealth(t *testing.T) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ import ( @@
     	"log"
     	"os"
-    	"github.com/snyk/vervet/v7/internal/cmd"
+    	"github.com/snyk/vervet/v8/internal/cmd"
     )
     func main() {
@@ Expand Down @@