From 6b12dcebe80dbef7f741f892b3739a94c2c55797 Mon Sep 17 00:00:00 2001 From: Jatin Naik Date: Wed, 2 Oct 2024 15:44:10 +0100 Subject: [PATCH] fix: update internal references to vervet v8 - removes transitive references to vervet v6 from downstream projects --- go.mod | 4 +- go.sum | 2 - testdata/embed_test.go | 2 +- versionware/example/chi/example_test.go | 16 +++--- versionware/example/embed_test.go | 4 +- versionware/example/go.mod | 28 +++++----- versionware/example/go.sum | 53 +++++++++---------- versionware/example/gorilla/example_test.go | 16 +++--- .../2021-11-01~experimental/spec.json | 6 +++ .../2021-11-01~experimental/spec.yaml | 4 ++ .../2021-11-08~experimental/spec.json | 9 ++++ .../2021-11-08~experimental/spec.yaml | 6 +++ .../2021-11-20~experimental/spec.json | 12 +++++ .../2021-11-20~experimental/spec.yaml | 8 +++ .../resources/things/2021-11-01/handlers.go | 6 +-- .../resources/things/2021-11-08/handlers.go | 6 +-- .../resources/things/2021-11-20/handlers.go | 4 +- versionware/example/resources/things/types.go | 2 +- 18 files changed, 114 insertions(+), 74 deletions(-) diff --git a/go.mod b/go.mod index 167dfcdf..73521619 100644 --- a/go.mod +++ b/go.mod @@ -20,6 +20,7 @@ require ( github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.6.0 github.com/gorilla/mux v1.8.0 + github.com/hairyhenderson/go-codeowners v0.5.0 github.com/manifoldco/promptui v0.9.0 github.com/olekukonko/tablewriter v0.0.5 github.com/pkg/errors v0.9.1 @@ -27,7 +28,6 @@ require ( github.com/prometheus/client_model v0.5.0 github.com/rs/zerolog v1.31.0 github.com/slok/go-http-metrics v0.11.0 - github.com/snyk/vervet/v6 v6.2.4 github.com/spf13/viper v1.17.0 github.com/testcontainers/testcontainers-go v0.26.0 github.com/tufin/oasdiff v1.10.16 @@ -95,7 +95,6 @@ require ( github.com/google/s2a-go v0.1.7 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect github.com/googleapis/gax-go/v2 v2.12.4 // indirect - github.com/hairyhenderson/go-codeowners v0.5.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/invopop/yaml v0.3.1 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect @@ -131,6 +130,7 @@ require ( github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sagikazarmark/locafero v0.3.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect + github.com/sergi/go-diff v1.3.1 // indirect github.com/shirou/gopsutil/v3 v3.23.9 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect diff --git a/go.sum b/go.sum index 7698e3f8..67d5507a 100644 --- a/go.sum +++ b/go.sum @@ -464,8 +464,6 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/slok/go-http-metrics v0.11.0 h1:ABJUpekCZSkQT1wQrFvS4kGbhea/w6ndFJaWJeh3zL0= github.com/slok/go-http-metrics v0.11.0/go.mod h1:ZGKeYG1ET6TEJpQx18BqAJAvxw9jBAZXCHU7bWQqqAc= -github.com/snyk/vervet/v6 v6.2.4 h1:LetSyKjyiTYMVuSm3SNlEkLCf1pIZjJpv0aAgki7z8Y= -github.com/snyk/vervet/v6 v6.2.4/go.mod h1:Rw3/9MkF0zE3LAPaMg80CIA6puzpbzi1F813gV3H/e8= github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= github.com/spf13/afero v1.10.0 h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY= diff --git a/testdata/embed_test.go b/testdata/embed_test.go index 193f952b..169f172a 100644 --- a/testdata/embed_test.go +++ b/testdata/embed_test.go @@ -6,7 +6,7 @@ import ( qt "github.com/frankban/quicktest" "github.com/getkin/kin-openapi/openapi3" - "github.com/snyk/vervet/v6/testdata/output" + "github.com/snyk/vervet/v8/testdata/output" ) func TestEmbedding(t *testing.T) { diff --git a/versionware/example/chi/example_test.go b/versionware/example/chi/example_test.go index dbe49229..558c9003 100644 --- a/versionware/example/chi/example_test.go +++ b/versionware/example/chi/example_test.go @@ -15,14 +15,14 @@ import ( promware "github.com/slok/go-http-metrics/middleware" promware_std "github.com/slok/go-http-metrics/middleware/std" - "github.com/snyk/vervet/v6" - "github.com/snyk/vervet/v6/versionware" - . "github.com/snyk/vervet/v6/versionware/example" - "github.com/snyk/vervet/v6/versionware/example/releases" - release_2021_11_01 "github.com/snyk/vervet/v6/versionware/example/resources/things/2021-11-01" - release_2021_11_08 "github.com/snyk/vervet/v6/versionware/example/resources/things/2021-11-08" - release_2021_11_20 "github.com/snyk/vervet/v6/versionware/example/resources/things/2021-11-20" - "github.com/snyk/vervet/v6/versionware/example/store" + "github.com/snyk/vervet/v8" + "github.com/snyk/vervet/v8/versionware" + . "github.com/snyk/vervet/v8/versionware/example" + "github.com/snyk/vervet/v8/versionware/example/releases" + release_2021_11_01 "github.com/snyk/vervet/v8/versionware/example/resources/things/2021-11-01" + release_2021_11_08 "github.com/snyk/vervet/v8/versionware/example/resources/things/2021-11-08" + release_2021_11_20 "github.com/snyk/vervet/v8/versionware/example/resources/things/2021-11-20" + "github.com/snyk/vervet/v8/versionware/example/store" ) func Example() { diff --git a/versionware/example/embed_test.go b/versionware/example/embed_test.go index 209b02ec..24b901aa 100644 --- a/versionware/example/embed_test.go +++ b/versionware/example/embed_test.go @@ -5,8 +5,8 @@ import ( qt "github.com/frankban/quicktest" - "github.com/snyk/vervet/v6" - "github.com/snyk/vervet/v6/versionware/example/releases" + "github.com/snyk/vervet/v8" + "github.com/snyk/vervet/v8/versionware/example/releases" ) func TestEmbedding(t *testing.T) { diff --git a/versionware/example/go.mod b/versionware/example/go.mod index eca5dcb3..7058cce9 100644 --- a/versionware/example/go.mod +++ b/versionware/example/go.mod @@ -1,15 +1,17 @@ -module github.com/snyk/vervet/v6/versionware/example +module github.com/snyk/vervet/v8/versionware/example -go 1.21 +go 1.22.5 + +toolchain go1.22.8 require ( github.com/frankban/quicktest v1.14.6 - github.com/getkin/kin-openapi v0.120.0 + github.com/getkin/kin-openapi v0.127.0 github.com/go-chi/chi/v5 v5.0.10 github.com/gorilla/mux v1.8.0 github.com/prometheus/client_golang v1.17.0 github.com/slok/go-http-metrics v0.11.0 - github.com/snyk/vervet/v6 v6.0.0 + github.com/snyk/vervet/v8 v8.6.1 ) require ( @@ -17,27 +19,27 @@ require ( github.com/bmatcuk/doublestar/v4 v4.6.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/ghodss/yaml v1.0.0 // indirect - github.com/go-openapi/jsonpointer v0.20.0 // indirect - github.com/go-openapi/swag v0.22.4 // indirect + github.com/go-openapi/jsonpointer v0.21.0 // indirect + github.com/go-openapi/swag v0.23.0 // indirect github.com/google/go-cmp v0.6.0 // indirect - github.com/google/uuid v1.4.0 // indirect - github.com/invopop/yaml v0.2.0 // indirect + github.com/google/uuid v1.6.0 // indirect + github.com/hairyhenderson/go-codeowners v0.5.0 // indirect + github.com/invopop/yaml v0.3.1 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect - github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect github.com/perimeterx/marshmallow v1.1.5 // indirect github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.45.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - github.com/rogpeppe/go-internal v1.11.0 // indirect + github.com/rogpeppe/go-internal v1.12.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect - golang.org/x/sys v0.15.0 // indirect - google.golang.org/protobuf v1.31.0 // indirect + golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect + golang.org/x/sys v0.23.0 // indirect + google.golang.org/protobuf v1.34.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/versionware/example/go.sum b/versionware/example/go.sum index 53849d59..b7fe177b 100644 --- a/versionware/example/go.sum +++ b/versionware/example/go.sum @@ -9,29 +9,29 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= -github.com/getkin/kin-openapi v0.120.0 h1:MqJcNJFrMDFNc07iwE8iFC5eT2k/NPUFDIpNeiZv8Jg= -github.com/getkin/kin-openapi v0.120.0/go.mod h1:PCWw/lfBrJY4HcdqE3jj+QFkaFK8ABoqo7PvqVhXXqw= +github.com/getkin/kin-openapi v0.127.0 h1:Mghqi3Dhryf3F8vR370nN67pAERW+3a95vomb3MAREY= +github.com/getkin/kin-openapi v0.127.0/go.mod h1:OZrfXzUfGrNbsKj+xmFBx6E5c6yH3At/tAKSc2UszXM= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-chi/chi/v5 v5.0.10 h1:rLz5avzKpjqxrYwXNfmjkrYYXOyLJd37pz53UFHC6vk= github.com/go-chi/chi/v5 v5.0.10/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= -github.com/go-openapi/jsonpointer v0.20.0 h1:ESKJdU9ASRfaPNOPRx12IUyA1vn3R9GiE3KYD14BXdQ= -github.com/go-openapi/jsonpointer v0.20.0/go.mod h1:6PGzBjjIIumbLYysB73Klnms1mwnU4G3YHOECG3CedA= -github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU= -github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= +github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= +github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= +github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= +github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM= github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= -github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/invopop/yaml v0.2.0 h1:7zky/qH+O0DwAyoobXUqvVBwgBFRxKoQ/3FjcVpjTMY= -github.com/invopop/yaml v0.2.0/go.mod h1:2XuRLgs/ouIrW3XNzuNj7J3Nvu/Dig5MXvbCEdiBN3Q= +github.com/hairyhenderson/go-codeowners v0.5.0 h1:dpQB+hVHiRc2VVvc2BHxkuM+tmu9Qej/as3apqUbsWc= +github.com/hairyhenderson/go-codeowners v0.5.0/go.mod h1:R3uW1OQXEj2Gu6/OvZ7bt6hr0qdkLvUWPiqNaWnexpo= +github.com/invopop/yaml v0.3.1 h1:f0+ZpmhfBSS4MhG+4HYseMdJhoeeopbSKbq5Rpeelso= +github.com/invopop/yaml v0.3.1/go.mod h1:PMOp3nn4/12yEZUFfmOuNHJsZToEEOwoWsT+D81KkeA= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= @@ -42,8 +42,6 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg= github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k= -github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= -github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s= @@ -60,33 +58,30 @@ github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGy github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= -github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= -github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/slok/go-http-metrics v0.11.0 h1:ABJUpekCZSkQT1wQrFvS4kGbhea/w6ndFJaWJeh3zL0= github.com/slok/go-http-metrics v0.11.0/go.mod h1:ZGKeYG1ET6TEJpQx18BqAJAvxw9jBAZXCHU7bWQqqAc= -github.com/snyk/vervet/v6 v6.0.0 h1:acmoY49D7HXcrpW58Izh3CMlAodg+YurUqDY5H5m/sg= -github.com/snyk/vervet/v6 v6.0.0/go.mod h1:+yEWhrnAr/mlsRexWfzOaFlmVPODKmhxMuRofrRsWzI= +github.com/snyk/vervet/v8 v8.6.1 h1:7bzDqsBXbYtO4FKNZsPQ16ibVioi8nzIW7m6OehsYrw= +github.com/snyk/vervet/v8 v8.6.1/go.mod h1:kRupBPOcD3t5kUP9Y1SsaKCqwdwF3UlAKWfdfdHyl8Y= github.com/stretchr/objx v0.5.1 h1:4VhoImhV/Bm0ToFkXFi8hXNXwpDRZ/ynw3amt82mzq0= github.com/stretchr/objx v0.5.1/go.mod h1:/iHQpkQwBD6DLUmQ4pE+s1TXdob1mORJ4/UFdrifcy0= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU= github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= -golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI= -golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= -golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa h1:ELnwvuAXPNtPk1TJRuGkI9fDTwym6AYBu0qzT8AcHdI= +golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= +golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= +golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= +google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/versionware/example/gorilla/example_test.go b/versionware/example/gorilla/example_test.go index 60d2bc5a..571b37a1 100644 --- a/versionware/example/gorilla/example_test.go +++ b/versionware/example/gorilla/example_test.go @@ -13,14 +13,14 @@ import ( promware "github.com/slok/go-http-metrics/middleware" promware_std "github.com/slok/go-http-metrics/middleware/std" - "github.com/snyk/vervet/v6" - "github.com/snyk/vervet/v6/versionware" - . "github.com/snyk/vervet/v6/versionware/example" - "github.com/snyk/vervet/v6/versionware/example/releases" - release_2021_11_01 "github.com/snyk/vervet/v6/versionware/example/resources/things/2021-11-01" - release_2021_11_08 "github.com/snyk/vervet/v6/versionware/example/resources/things/2021-11-08" - release_2021_11_20 "github.com/snyk/vervet/v6/versionware/example/resources/things/2021-11-20" - "github.com/snyk/vervet/v6/versionware/example/store" + "github.com/snyk/vervet/v8" + "github.com/snyk/vervet/v8/versionware" + . "github.com/snyk/vervet/v8/versionware/example" + "github.com/snyk/vervet/v8/versionware/example/releases" + release_2021_11_01 "github.com/snyk/vervet/v8/versionware/example/resources/things/2021-11-01" + release_2021_11_08 "github.com/snyk/vervet/v8/versionware/example/resources/things/2021-11-08" + release_2021_11_20 "github.com/snyk/vervet/v8/versionware/example/resources/things/2021-11-20" + "github.com/snyk/vervet/v8/versionware/example/store" ) func Example() { diff --git a/versionware/example/releases/2021-11-01~experimental/spec.json b/versionware/example/releases/2021-11-01~experimental/spec.json index a4b06f3b..e45ef5df 100644 --- a/versionware/example/releases/2021-11-01~experimental/spec.json +++ b/versionware/example/releases/2021-11-01~experimental/spec.json @@ -81,6 +81,9 @@ "description": "Created things successfully" } }, + "x-snyk-api-owners": [ + "@snyk/api" + ], "x-snyk-api-releases": [ "2021-11-01~experimental" ], @@ -109,6 +112,9 @@ "description": "Returns an instance of things" } }, + "x-snyk-api-owners": [ + "@snyk/api" + ], "x-snyk-api-releases": [ "2021-11-01~experimental" ], diff --git a/versionware/example/releases/2021-11-01~experimental/spec.yaml b/versionware/example/releases/2021-11-01~experimental/spec.yaml index 9a3d883d..ce4d54b8 100644 --- a/versionware/example/releases/2021-11-01~experimental/spec.yaml +++ b/versionware/example/releases/2021-11-01~experimental/spec.yaml @@ -55,6 +55,8 @@ paths: schema: $ref: '#/components/schemas/ThingResponse' description: Created things successfully + x-snyk-api-owners: + - '@snyk/api' x-snyk-api-releases: - 2021-11-01~experimental x-snyk-api-version: 2021-11-01~experimental @@ -72,6 +74,8 @@ paths: schema: $ref: '#/components/schemas/ThingResponse' description: Returns an instance of things + x-snyk-api-owners: + - '@snyk/api' x-snyk-api-releases: - 2021-11-01~experimental x-snyk-api-version: 2021-11-01~experimental diff --git a/versionware/example/releases/2021-11-08~experimental/spec.json b/versionware/example/releases/2021-11-08~experimental/spec.json index 3c375d38..dabeb7fb 100644 --- a/versionware/example/releases/2021-11-08~experimental/spec.json +++ b/versionware/example/releases/2021-11-08~experimental/spec.json @@ -82,6 +82,9 @@ "description": "Returns a list of things" } }, + "x-snyk-api-owners": [ + "@snyk/api" + ], "x-snyk-api-releases": [ "2021-11-08~experimental" ], @@ -112,6 +115,9 @@ "description": "Created things successfully" } }, + "x-snyk-api-owners": [ + "@snyk/api" + ], "x-snyk-api-releases": [ "2021-11-01~experimental" ], @@ -140,6 +146,9 @@ "description": "Returns an instance of things" } }, + "x-snyk-api-owners": [ + "@snyk/api" + ], "x-snyk-api-releases": [ "2021-11-01~experimental" ], diff --git a/versionware/example/releases/2021-11-08~experimental/spec.yaml b/versionware/example/releases/2021-11-08~experimental/spec.yaml index 982ebdde..78de3197 100644 --- a/versionware/example/releases/2021-11-08~experimental/spec.yaml +++ b/versionware/example/releases/2021-11-08~experimental/spec.yaml @@ -56,6 +56,8 @@ paths: schema: $ref: '#/components/schemas/ThingCollectionResponse' description: Returns a list of things + x-snyk-api-owners: + - '@snyk/api' x-snyk-api-releases: - 2021-11-08~experimental x-snyk-api-version: 2021-11-08~experimental @@ -75,6 +77,8 @@ paths: schema: $ref: '#/components/schemas/ThingResponse' description: Created things successfully + x-snyk-api-owners: + - '@snyk/api' x-snyk-api-releases: - 2021-11-01~experimental x-snyk-api-version: 2021-11-01~experimental @@ -92,6 +96,8 @@ paths: schema: $ref: '#/components/schemas/ThingResponse' description: Returns an instance of things + x-snyk-api-owners: + - '@snyk/api' x-snyk-api-releases: - 2021-11-01~experimental x-snyk-api-version: 2021-11-01~experimental diff --git a/versionware/example/releases/2021-11-20~experimental/spec.json b/versionware/example/releases/2021-11-20~experimental/spec.json index c61f7515..6e171eae 100644 --- a/versionware/example/releases/2021-11-20~experimental/spec.json +++ b/versionware/example/releases/2021-11-20~experimental/spec.json @@ -82,6 +82,9 @@ "description": "Returns a list of things" } }, + "x-snyk-api-owners": [ + "@snyk/api" + ], "x-snyk-api-releases": [ "2021-11-08~experimental" ], @@ -112,6 +115,9 @@ "description": "Created things successfully" } }, + "x-snyk-api-owners": [ + "@snyk/api" + ], "x-snyk-api-releases": [ "2021-11-01~experimental" ], @@ -133,6 +139,9 @@ "description": "Returns an instance of things" } }, + "x-snyk-api-owners": [ + "@snyk/api" + ], "x-snyk-api-releases": [ "2021-11-20~experimental" ], @@ -158,6 +167,9 @@ "description": "Returns an instance of things" } }, + "x-snyk-api-owners": [ + "@snyk/api" + ], "x-snyk-api-releases": [ "2021-11-01~experimental" ], diff --git a/versionware/example/releases/2021-11-20~experimental/spec.yaml b/versionware/example/releases/2021-11-20~experimental/spec.yaml index 7cadc671..bad57ee7 100644 --- a/versionware/example/releases/2021-11-20~experimental/spec.yaml +++ b/versionware/example/releases/2021-11-20~experimental/spec.yaml @@ -56,6 +56,8 @@ paths: schema: $ref: '#/components/schemas/ThingCollectionResponse' description: Returns a list of things + x-snyk-api-owners: + - '@snyk/api' x-snyk-api-releases: - 2021-11-08~experimental x-snyk-api-version: 2021-11-08~experimental @@ -75,6 +77,8 @@ paths: schema: $ref: '#/components/schemas/ThingResponse' description: Created things successfully + x-snyk-api-owners: + - '@snyk/api' x-snyk-api-releases: - 2021-11-01~experimental x-snyk-api-version: 2021-11-01~experimental @@ -88,6 +92,8 @@ paths: responses: "204": description: Returns an instance of things + x-snyk-api-owners: + - '@snyk/api' x-snyk-api-releases: - 2021-11-20~experimental x-snyk-api-version: 2021-11-20~experimental @@ -103,6 +109,8 @@ paths: schema: $ref: '#/components/schemas/ThingResponse' description: Returns an instance of things + x-snyk-api-owners: + - '@snyk/api' x-snyk-api-releases: - 2021-11-01~experimental x-snyk-api-version: 2021-11-01~experimental diff --git a/versionware/example/resources/things/2021-11-01/handlers.go b/versionware/example/resources/things/2021-11-01/handlers.go index 6389c78b..34b938f5 100644 --- a/versionware/example/resources/things/2021-11-01/handlers.go +++ b/versionware/example/resources/things/2021-11-01/handlers.go @@ -6,9 +6,9 @@ import ( "net/http" "path" - "github.com/snyk/vervet/v6" - "github.com/snyk/vervet/v6/versionware/example/resources/things" - "github.com/snyk/vervet/v6/versionware/example/store" + "github.com/snyk/vervet/v8" + "github.com/snyk/vervet/v8/versionware/example/resources/things" + "github.com/snyk/vervet/v8/versionware/example/store" ) // Version is the resource release version of handlers in this package. diff --git a/versionware/example/resources/things/2021-11-08/handlers.go b/versionware/example/resources/things/2021-11-08/handlers.go index fe7490fd..0bada54f 100644 --- a/versionware/example/resources/things/2021-11-08/handlers.go +++ b/versionware/example/resources/things/2021-11-08/handlers.go @@ -5,9 +5,9 @@ import ( "log" "net/http" - "github.com/snyk/vervet/v6" - "github.com/snyk/vervet/v6/versionware/example/resources/things" - "github.com/snyk/vervet/v6/versionware/example/store" + "github.com/snyk/vervet/v8" + "github.com/snyk/vervet/v8/versionware/example/resources/things" + "github.com/snyk/vervet/v8/versionware/example/store" ) // Version is the resource release version of handlers in this package. diff --git a/versionware/example/resources/things/2021-11-20/handlers.go b/versionware/example/resources/things/2021-11-20/handlers.go index 07b1cb28..621e8f61 100644 --- a/versionware/example/resources/things/2021-11-20/handlers.go +++ b/versionware/example/resources/things/2021-11-20/handlers.go @@ -4,8 +4,8 @@ import ( "net/http" "path" - "github.com/snyk/vervet/v6" - "github.com/snyk/vervet/v6/versionware/example/store" + "github.com/snyk/vervet/v8" + "github.com/snyk/vervet/v8/versionware/example/store" ) // Version is the resource release version of handlers in this package. diff --git a/versionware/example/resources/things/types.go b/versionware/example/resources/things/types.go index 232401fe..25273ae3 100644 --- a/versionware/example/resources/things/types.go +++ b/versionware/example/resources/things/types.go @@ -4,7 +4,7 @@ package things import ( "time" - "github.com/snyk/vervet/v6/versionware/example/store" + "github.com/snyk/vervet/v8/versionware/example/store" ) // Attributes represents the data contents of a Thing resource.