From 0c7693b35a562ca90d3102bf63a0f9da58ec304a Mon Sep 17 00:00:00 2001 From: Jatin Naik Date: Fri, 16 Aug 2024 08:43:19 +0100 Subject: [PATCH] feat!: upgrade to kin-openapi 0.127 kin-openapi has breaking changes to a number of underlying structs --- cmd/vervet/main.go | 2 +- cmd/vu-api/main.go | 12 ++++++------ cmd/vu-scraper/main.go | 12 ++++++------ collator_test.go | 4 ++-- config/config_test.go | 2 +- config/underground.go | 2 +- config/underground_test.go | 4 ++-- document_test.go | 4 ++-- generate/generate.go | 4 ++-- generate/generate_test.go | 4 ++-- go.mod | 2 +- include_headers_test.go | 4 ++-- inliner.go | 2 +- internal/backstage/backstage.go | 2 +- internal/backstage/backstage_test.go | 2 +- internal/cmd/backstage.go | 4 ++-- internal/cmd/compiler.go | 8 ++++---- internal/cmd/compiler_test.go | 6 +++--- internal/cmd/filter.go | 2 +- internal/cmd/filter_test.go | 6 +++--- internal/cmd/generate.go | 2 +- internal/cmd/localize.go | 2 +- internal/cmd/resolve.go | 2 +- internal/cmd/resource.go | 6 +++--- internal/cmd/resource_test.go | 4 ++-- internal/cmd/scaffold.go | 2 +- internal/cmd/scaffold_test.go | 4 ++-- internal/compiler/compiler.go | 6 +++--- internal/compiler/compiler_test.go | 6 +++--- internal/files/files.go | 4 ++-- internal/generator/generator.go | 4 ++-- internal/generator/generator_test.go | 4 ++-- internal/generator/resources.go | 6 +++--- internal/handler/handler.go | 8 ++++---- internal/handler/handler_test.go | 6 +++--- internal/scaffold/scaffold.go | 2 +- internal/scaffold/scaffold_test.go | 4 ++-- internal/scraper/gcs_scraper_test.go | 8 ++++---- internal/scraper/metrics_test.go | 4 ++-- internal/scraper/s3_scraper_test.go | 8 ++++---- internal/scraper/scraper.go | 4 ++-- internal/scraper/scraper_test.go | 6 +++--- internal/simplebuild/build.go | 6 +++--- internal/simplebuild/build_test.go | 4 ++-- internal/simplebuild/output.go | 8 ++++---- internal/simplebuild/output_test.go | 4 ++-- internal/simplebuild/overlays.go | 4 ++-- internal/simplebuild/refs_test.go | 2 +- internal/storage/collator.go | 2 +- internal/storage/collator_test.go | 6 +++--- internal/storage/disk/disk.go | 4 ++-- internal/storage/disk/disk_test.go | 2 +- internal/storage/gcs/client.go | 4 ++-- internal/storage/gcs/client_test.go | 6 +++--- internal/storage/gcs/testing/testing.go | 2 +- internal/storage/revision.go | 2 +- internal/storage/revision_test.go | 4 ++-- internal/storage/s3/client.go | 4 ++-- internal/storage/s3/client_test.go | 6 +++--- internal/storage/s3/testing/testing.go | 2 +- internal/storage/storage.go | 2 +- merge_test.go | 4 ++-- ref_alias_resolver.go | 2 +- ref_alias_resolver_test.go | 4 ++-- ref_index_test.go | 4 ++-- remove_elements_test.go | 4 ++-- resource_test.go | 4 ++-- spec_test.go | 4 ++-- util_test.go | 4 ++-- version_test.go | 2 +- versionware/handler.go | 2 +- versionware/handler_test.go | 4 ++-- versionware/validator.go | 2 +- versionware/validator_test.go | 2 +- 74 files changed, 153 insertions(+), 153 deletions(-) diff --git a/cmd/vervet/main.go b/cmd/vervet/main.go index 16c5e950..d0a78745 100644 --- 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 index 53537b74..0777a526 100644 --- 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 index ec746282..77520ce2 100644 --- 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 index 52ed2886..260a9fc2 100644 --- 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 index 609ce845..e692c7fe 100644 --- 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 index d4393bea..16fcf02f 100644 --- 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 index 08123951..f3d6330a 100644 --- 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 index d59bbdf3..fbf63319 100644 --- 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 index fa82fa5f..32802efe 100644 --- 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 index ec6a23cb..cb7d9158 100644 --- 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 index 67ff2bbb..e69ad7b6 100644 --- 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 index a6534fa0..84408520 100644 --- 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 index 3ced6b6a..1b329472 100644 --- 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 index 996b3916..8075f9e4 100644 --- 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 index 857779f4..52f0e3d0 100644 --- 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 index e82ce1e4..4069e405 100644 --- 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 index c228dc7f..ece748fc 100644 --- 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 index 74eb48ee..729f96da 100644 --- 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 index e2b5cec7..357ae19c 100644 --- 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 index 719ad984..2c84d445 100644 --- 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 index 94f92d73..1d4d914c 100644 --- 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 index 5a0f2527..6ce9932c 100644 --- 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 index f5f5ae2a..2fe1d3d1 100644 --- 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 index b2c049f7..f6853280 100644 --- 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 index 798e0b30..cc1e677e 100644 --- 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 index eb3f67f9..eae47a2a 100644 --- 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 index cd7b7e96..879c9585 100644 --- 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 index 8e4faba0..be4bbeb3 100644 --- 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 index e62f1e2a..4deb16cd 100644 --- 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 index 0f25af5a..ef6d504b 100644 --- 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 index 8cbd545f..bd4ca288 100644 --- 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 index 34b1bd65..637a1cf8 100644 --- 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 index b0fd9553..3fc2ff5c 100644 --- 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 index bb97b8d3..5e81a226 100644 --- 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 index 58bba9ed..0170023a 100644 --- 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) { diff --git a/internal/scaffold/scaffold.go b/internal/scaffold/scaffold.go index 312e756a..d37ac158 100644 --- a/internal/scaffold/scaffold.go +++ b/internal/scaffold/scaffold.go @@ -8,7 +8,7 @@ import ( "github.com/ghodss/yaml" - "github.com/snyk/vervet/v7/internal/files" + "github.com/snyk/vervet/v8/internal/files" ) // ErrAlreadyInitialized is used when scaffolding is being run on a project that is already setup. diff --git a/internal/scaffold/scaffold_test.go b/internal/scaffold/scaffold_test.go index 4e0d1889..128eae92 100644 --- a/internal/scaffold/scaffold_test.go +++ b/internal/scaffold/scaffold_test.go @@ -7,8 +7,8 @@ import ( qt "github.com/frankban/quicktest" - "github.com/snyk/vervet/v7/internal/scaffold" - "github.com/snyk/vervet/v7/testdata" + "github.com/snyk/vervet/v8/internal/scaffold" + "github.com/snyk/vervet/v8/testdata" ) func TestScaffold(t *testing.T) { diff --git a/internal/scraper/gcs_scraper_test.go b/internal/scraper/gcs_scraper_test.go index 1732c8d1..81d9364c 100644 --- a/internal/scraper/gcs_scraper_test.go +++ b/internal/scraper/gcs_scraper_test.go @@ -9,10 +9,10 @@ import ( qt "github.com/frankban/quicktest" "github.com/getkin/kin-openapi/openapi3" - "github.com/snyk/vervet/v7/config" - "github.com/snyk/vervet/v7/internal/scraper" - "github.com/snyk/vervet/v7/internal/storage/gcs" - gcstesting "github.com/snyk/vervet/v7/internal/storage/gcs/testing" + "github.com/snyk/vervet/v8/config" + "github.com/snyk/vervet/v8/internal/scraper" + "github.com/snyk/vervet/v8/internal/storage/gcs" + gcstesting "github.com/snyk/vervet/v8/internal/storage/gcs/testing" ) func TestGCSScraper(t *testing.T) { diff --git a/internal/scraper/metrics_test.go b/internal/scraper/metrics_test.go index e373c0b6..9d4ff988 100644 --- a/internal/scraper/metrics_test.go +++ b/internal/scraper/metrics_test.go @@ -8,8 +8,8 @@ import ( qt "github.com/frankban/quicktest" "github.com/prometheus/client_golang/prometheus" - "github.com/snyk/vervet/v7/internal/scraper" - "github.com/snyk/vervet/v7/internal/testutil" + "github.com/snyk/vervet/v8/internal/scraper" + "github.com/snyk/vervet/v8/internal/testutil" ) type mockRoundTripper struct { diff --git a/internal/scraper/s3_scraper_test.go b/internal/scraper/s3_scraper_test.go index a9407081..b57205ab 100644 --- a/internal/scraper/s3_scraper_test.go +++ b/internal/scraper/s3_scraper_test.go @@ -9,10 +9,10 @@ import ( qt "github.com/frankban/quicktest" "github.com/getkin/kin-openapi/openapi3" - "github.com/snyk/vervet/v7/config" - "github.com/snyk/vervet/v7/internal/scraper" - "github.com/snyk/vervet/v7/internal/storage/s3" - s3testing "github.com/snyk/vervet/v7/internal/storage/s3/testing" + "github.com/snyk/vervet/v8/config" + "github.com/snyk/vervet/v8/internal/scraper" + "github.com/snyk/vervet/v8/internal/storage/s3" + s3testing "github.com/snyk/vervet/v8/internal/storage/s3/testing" ) func TestS3Scraper(t *testing.T) { diff --git a/internal/scraper/scraper.go b/internal/scraper/scraper.go index a1e85375..89f83408 100644 --- a/internal/scraper/scraper.go +++ b/internal/scraper/scraper.go @@ -16,8 +16,8 @@ import ( "github.com/rs/zerolog/log" "go.uber.org/multierr" - "github.com/snyk/vervet/v7/config" - "github.com/snyk/vervet/v7/internal/storage" + "github.com/snyk/vervet/v8/config" + "github.com/snyk/vervet/v8/internal/storage" ) // Scraper gets OpenAPI specs from a collection of services and updates storage diff --git a/internal/scraper/scraper_test.go b/internal/scraper/scraper_test.go index f79b3a25..af406916 100644 --- a/internal/scraper/scraper_test.go +++ b/internal/scraper/scraper_test.go @@ -14,9 +14,9 @@ import ( "github.com/gorilla/mux" "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/disk" + "github.com/snyk/vervet/v8/config" + "github.com/snyk/vervet/v8/internal/scraper" + "github.com/snyk/vervet/v8/internal/storage/disk" ) var ( diff --git a/internal/simplebuild/build.go b/internal/simplebuild/build.go index 688c0ea7..9b80bf2c 100644 --- a/internal/simplebuild/build.go +++ b/internal/simplebuild/build.go @@ -9,9 +9,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/files" + "github.com/snyk/vervet/v8" + "github.com/snyk/vervet/v8/config" + "github.com/snyk/vervet/v8/internal/files" ) // Build compiles the versioned resources in a project configuration based on diff --git a/internal/simplebuild/build_test.go b/internal/simplebuild/build_test.go index 083853b7..c8fc328d 100644 --- a/internal/simplebuild/build_test.go +++ b/internal/simplebuild/build_test.go @@ -8,8 +8,8 @@ import ( qt "github.com/frankban/quicktest" "github.com/getkin/kin-openapi/openapi3" - "github.com/snyk/vervet/v7" - "github.com/snyk/vervet/v7/internal/simplebuild" + "github.com/snyk/vervet/v8" + "github.com/snyk/vervet/v8/internal/simplebuild" ) func TestGetLatest(t *testing.T) { diff --git a/internal/simplebuild/output.go b/internal/simplebuild/output.go index 00bb2e8e..7b5cd7af 100644 --- a/internal/simplebuild/output.go +++ b/internal/simplebuild/output.go @@ -11,10 +11,10 @@ import ( "github.com/ghodss/yaml" - "github.com/snyk/vervet/v7" - "github.com/snyk/vervet/v7/config" - "github.com/snyk/vervet/v7/internal/compiler" - "github.com/snyk/vervet/v7/internal/files" + "github.com/snyk/vervet/v8" + "github.com/snyk/vervet/v8/config" + "github.com/snyk/vervet/v8/internal/compiler" + "github.com/snyk/vervet/v8/internal/files" ) // Some services have a need to write specs to multiple destinations. This diff --git a/internal/simplebuild/output_test.go b/internal/simplebuild/output_test.go index 9afef9b8..45dfd08b 100644 --- a/internal/simplebuild/output_test.go +++ b/internal/simplebuild/output_test.go @@ -9,8 +9,8 @@ import ( qt "github.com/frankban/quicktest" "github.com/getkin/kin-openapi/openapi3" - "github.com/snyk/vervet/v7" - "github.com/snyk/vervet/v7/config" + "github.com/snyk/vervet/v8" + "github.com/snyk/vervet/v8/config" ) func TestDocSet_WriteOutputs(t *testing.T) { diff --git a/internal/simplebuild/overlays.go b/internal/simplebuild/overlays.go index 23d6d51d..b3e504de 100644 --- a/internal/simplebuild/overlays.go +++ b/internal/simplebuild/overlays.go @@ -7,8 +7,8 @@ import ( "github.com/getkin/kin-openapi/openapi3" - "github.com/snyk/vervet/v7" - "github.com/snyk/vervet/v7/config" + "github.com/snyk/vervet/v8" + "github.com/snyk/vervet/v8/config" ) func (docs DocSet) ApplyOverlays(ctx context.Context, cfgs []*config.Overlay) error { diff --git a/internal/simplebuild/refs_test.go b/internal/simplebuild/refs_test.go index 226ec114..bd41d69e 100644 --- a/internal/simplebuild/refs_test.go +++ b/internal/simplebuild/refs_test.go @@ -6,7 +6,7 @@ import ( qt "github.com/frankban/quicktest" "github.com/getkin/kin-openapi/openapi3" - "github.com/snyk/vervet/v7/internal/simplebuild" + "github.com/snyk/vervet/v8/internal/simplebuild" ) func TestResolveRefs(t *testing.T) { diff --git a/internal/storage/collator.go b/internal/storage/collator.go index d0ac31ed..824ff8d7 100644 --- a/internal/storage/collator.go +++ b/internal/storage/collator.go @@ -8,7 +8,7 @@ import ( "github.com/getkin/kin-openapi/openapi3" "github.com/rs/zerolog/log" - "github.com/snyk/vervet/v7" + "github.com/snyk/vervet/v8" ) // Collator is an aggregate of service specs and uniqueVersions scraped by VU. It diff --git a/internal/storage/collator_test.go b/internal/storage/collator_test.go index 05634bd1..c501c68f 100644 --- a/internal/storage/collator_test.go +++ b/internal/storage/collator_test.go @@ -7,9 +7,9 @@ import ( qt "github.com/frankban/quicktest" - "github.com/snyk/vervet/v7" - "github.com/snyk/vervet/v7/internal/storage" - "github.com/snyk/vervet/v7/testdata" + "github.com/snyk/vervet/v8" + "github.com/snyk/vervet/v8/internal/storage" + "github.com/snyk/vervet/v8/testdata" ) const serviceASpec = ` diff --git a/internal/storage/disk/disk.go b/internal/storage/disk/disk.go index 911c6fb6..f1419ec9 100644 --- a/internal/storage/disk/disk.go +++ b/internal/storage/disk/disk.go @@ -17,8 +17,8 @@ import ( "github.com/getkin/kin-openapi/openapi3" - "github.com/snyk/vervet/v7" - "github.com/snyk/vervet/v7/internal/storage" + "github.com/snyk/vervet/v8" + "github.com/snyk/vervet/v8/internal/storage" ) type Storage struct { diff --git a/internal/storage/disk/disk_test.go b/internal/storage/disk/disk_test.go index 8c9d2e7b..2198953a 100644 --- a/internal/storage/disk/disk_test.go +++ b/internal/storage/disk/disk_test.go @@ -8,7 +8,7 @@ import ( qt "github.com/frankban/quicktest" - "github.com/snyk/vervet/v7/internal/storage" + "github.com/snyk/vervet/v8/internal/storage" ) var t0 = time.Date(2021, time.December, 3, 20, 49, 51, 0, time.UTC) diff --git a/internal/storage/gcs/client.go b/internal/storage/gcs/client.go index 1cb9ec65..640ea4e5 100644 --- a/internal/storage/gcs/client.go +++ b/internal/storage/gcs/client.go @@ -16,8 +16,8 @@ import ( "google.golang.org/api/iterator" "google.golang.org/api/option" - "github.com/snyk/vervet/v7" - vustorage "github.com/snyk/vervet/v7/internal/storage" + "github.com/snyk/vervet/v8" + vustorage "github.com/snyk/vervet/v8/internal/storage" ) // StaticKeyCredentials structure google.Credentials for diff --git a/internal/storage/gcs/client_test.go b/internal/storage/gcs/client_test.go index 50a84140..ed6d2aff 100644 --- a/internal/storage/gcs/client_test.go +++ b/internal/storage/gcs/client_test.go @@ -7,9 +7,9 @@ import ( qt "github.com/frankban/quicktest" - "github.com/snyk/vervet/v7/internal/storage" - "github.com/snyk/vervet/v7/internal/storage/gcs" - gcstesting "github.com/snyk/vervet/v7/internal/storage/gcs/testing" + "github.com/snyk/vervet/v8/internal/storage" + "github.com/snyk/vervet/v8/internal/storage/gcs" + gcstesting "github.com/snyk/vervet/v8/internal/storage/gcs/testing" ) var specFile = "spec.txt" diff --git a/internal/storage/gcs/testing/testing.go b/internal/storage/gcs/testing/testing.go index 3c816a23..1baced9d 100644 --- a/internal/storage/gcs/testing/testing.go +++ b/internal/storage/gcs/testing/testing.go @@ -16,7 +16,7 @@ import ( "github.com/testcontainers/testcontainers-go" "github.com/testcontainers/testcontainers-go/wait" - "github.com/snyk/vervet/v7/internal/storage/gcs" + "github.com/snyk/vervet/v8/internal/storage/gcs" ) const ( diff --git a/internal/storage/revision.go b/internal/storage/revision.go index be6f7078..14ef5a31 100644 --- a/internal/storage/revision.go +++ b/internal/storage/revision.go @@ -5,7 +5,7 @@ import ( "sort" "time" - "github.com/snyk/vervet/v7" + "github.com/snyk/vervet/v8" ) // ContentRevision is the exact contents and metadata of a service's version at scraping timestamp. diff --git a/internal/storage/revision_test.go b/internal/storage/revision_test.go index a36eb764..45248e06 100644 --- a/internal/storage/revision_test.go +++ b/internal/storage/revision_test.go @@ -6,8 +6,8 @@ import ( qt "github.com/frankban/quicktest" - "github.com/snyk/vervet/v7" - "github.com/snyk/vervet/v7/internal/storage" + "github.com/snyk/vervet/v8" + "github.com/snyk/vervet/v8/internal/storage" ) func TestServiceRevisions_ResolveLatestRevision(t *testing.T) { diff --git a/internal/storage/s3/client.go b/internal/storage/s3/client.go index 201fa502..d9cb13c4 100644 --- a/internal/storage/s3/client.go +++ b/internal/storage/s3/client.go @@ -22,8 +22,8 @@ import ( "github.com/rs/zerolog/log" "go.uber.org/multierr" - "github.com/snyk/vervet/v7" - "github.com/snyk/vervet/v7/internal/storage" + "github.com/snyk/vervet/v8" + "github.com/snyk/vervet/v8/internal/storage" ) // StaticKeyCredentials defines credential structure used in config.LoadDefaultConfig. diff --git a/internal/storage/s3/client_test.go b/internal/storage/s3/client_test.go index bb0d4877..5904def5 100644 --- a/internal/storage/s3/client_test.go +++ b/internal/storage/s3/client_test.go @@ -7,9 +7,9 @@ import ( qt "github.com/frankban/quicktest" - "github.com/snyk/vervet/v7/internal/storage" - "github.com/snyk/vervet/v7/internal/storage/s3" - s3testing "github.com/snyk/vervet/v7/internal/storage/s3/testing" + "github.com/snyk/vervet/v8/internal/storage" + "github.com/snyk/vervet/v8/internal/storage/s3" + s3testing "github.com/snyk/vervet/v8/internal/storage/s3/testing" ) func TestPutObject(t *testing.T) { diff --git a/internal/storage/s3/testing/testing.go b/internal/storage/s3/testing/testing.go index 68470f0b..25bb9cbe 100644 --- a/internal/storage/s3/testing/testing.go +++ b/internal/storage/s3/testing/testing.go @@ -6,7 +6,7 @@ import ( "github.com/elgohr/go-localstack" qt "github.com/frankban/quicktest" - "github.com/snyk/vervet/v7/internal/storage/s3" + "github.com/snyk/vervet/v8/internal/storage/s3" ) const ( diff --git a/internal/storage/storage.go b/internal/storage/storage.go index 692368a0..ac2a7cef 100644 --- a/internal/storage/storage.go +++ b/internal/storage/storage.go @@ -9,7 +9,7 @@ import ( "github.com/getkin/kin-openapi/openapi3" "github.com/rs/zerolog/log" - "github.com/snyk/vervet/v7" + "github.com/snyk/vervet/v8" ) // ReadOnlyStorage defines functionality needed to fetch spec versions. diff --git a/merge_test.go b/merge_test.go index 7fcb7ec4..77fbc14b 100644 --- a/merge_test.go +++ b/merge_test.go @@ -7,8 +7,8 @@ import ( "github.com/getkin/kin-openapi/openapi3" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/snyk/vervet/v7" - "github.com/snyk/vervet/v7/testdata" + "github.com/snyk/vervet/v8" + "github.com/snyk/vervet/v8/testdata" ) var openapiCmp = qt.CmpEquals(cmpopts.IgnoreUnexported( diff --git a/ref_alias_resolver.go b/ref_alias_resolver.go index 3ac1fc3e..ff7b27b2 100644 --- a/ref_alias_resolver.go +++ b/ref_alias_resolver.go @@ -5,7 +5,7 @@ import ( "github.com/getkin/kin-openapi/openapi3" - "github.com/snyk/vervet/v7/internal/openapiwalker" + "github.com/snyk/vervet/v8/internal/openapiwalker" ) // refAliasResolver rewrites references in an OpenAPI document object to local diff --git a/ref_alias_resolver_test.go b/ref_alias_resolver_test.go index c4f63620..c34bb4fb 100644 --- a/ref_alias_resolver_test.go +++ b/ref_alias_resolver_test.go @@ -9,8 +9,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 TestLocalize(t *testing.T) { diff --git a/ref_index_test.go b/ref_index_test.go index c9e6c0b2..2fb37a65 100644 --- a/ref_index_test.go +++ b/ref_index_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 TestRefIndexSource(t *testing.T) { diff --git a/remove_elements_test.go b/remove_elements_test.go index f124440f..db6a8a4a 100644 --- a/remove_elements_test.go +++ b/remove_elements_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 TestRemoveElementsExact(t *testing.T) { diff --git a/resource_test.go b/resource_test.go index 121347b0..2d2d9688 100644 --- a/resource_test.go +++ b/resource_test.go @@ -8,8 +8,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 TestResource(t *testing.T) { diff --git a/spec_test.go b/spec_test.go index 4023d13e..3816e96d 100644 --- a/spec_test.go +++ b/spec_test.go @@ -6,8 +6,8 @@ import ( qt "github.com/frankban/quicktest" "github.com/getkin/kin-openapi/openapi3" - . "github.com/snyk/vervet/v7" - "github.com/snyk/vervet/v7/testdata" + . "github.com/snyk/vervet/v8" + "github.com/snyk/vervet/v8/testdata" ) func TestSpecs(t *testing.T) { diff --git a/util_test.go b/util_test.go index 827875b4..678cb669 100644 --- a/util_test.go +++ b/util_test.go @@ -6,8 +6,8 @@ import ( qt "github.com/frankban/quicktest" "github.com/ghodss/yaml" - "github.com/snyk/vervet/v7" - "github.com/snyk/vervet/v7/testdata" + "github.com/snyk/vervet/v8" + "github.com/snyk/vervet/v8/testdata" ) func TestToSpecYAML(t *testing.T) { diff --git a/version_test.go b/version_test.go index c9cb9fba..4a91b0f6 100644 --- a/version_test.go +++ b/version_test.go @@ -7,7 +7,7 @@ import ( qt "github.com/frankban/quicktest" - . "github.com/snyk/vervet/v7" + . "github.com/snyk/vervet/v8" ) func TestParseVersion(t *testing.T) { diff --git a/versionware/handler.go b/versionware/handler.go index f19c5a62..10d2799c 100644 --- a/versionware/handler.go +++ b/versionware/handler.go @@ -6,7 +6,7 @@ import ( "fmt" "net/http" - "github.com/snyk/vervet/v7" + "github.com/snyk/vervet/v8" ) const ( diff --git a/versionware/handler_test.go b/versionware/handler_test.go index b5c65c91..b6a44eea 100644 --- a/versionware/handler_test.go +++ b/versionware/handler_test.go @@ -9,8 +9,8 @@ import ( qt "github.com/frankban/quicktest" - "github.com/snyk/vervet/v7" - "github.com/snyk/vervet/v7/versionware" + "github.com/snyk/vervet/v8" + "github.com/snyk/vervet/v8/versionware" ) func ExampleHandler() { diff --git a/versionware/validator.go b/versionware/validator.go index a65f75ae..fe5da860 100644 --- a/versionware/validator.go +++ b/versionware/validator.go @@ -12,7 +12,7 @@ import ( "github.com/getkin/kin-openapi/openapi3filter" "github.com/getkin/kin-openapi/routers/gorillamux" - "github.com/snyk/vervet/v7" + "github.com/snyk/vervet/v8" ) // Validator provides versioned OpenAPI validation middleware for HTTP requests diff --git a/versionware/validator_test.go b/versionware/validator_test.go index 4d8ce4b3..753dd76b 100644 --- a/versionware/validator_test.go +++ b/versionware/validator_test.go @@ -15,7 +15,7 @@ import ( "github.com/getkin/kin-openapi/openapi3" "github.com/getkin/kin-openapi/openapi3filter" - "github.com/snyk/vervet/v7/versionware" + "github.com/snyk/vervet/v8/versionware" ) const (