diff --git a/tools/cli/Makefile b/tools/cli/Makefile index 624b003d42..de5a1ae3ba 100644 --- a/tools/cli/Makefile +++ b/tools/cli/Makefile @@ -34,7 +34,7 @@ deps: ## Download go module dependencies devtools: ## Install dev tools @echo "==> Installing dev tools..." go install go.uber.org/mock/mockgen@latest - go install github.com/tufin/oasdiff@v1.10.29 + go install github.com/oasdiff/oasdiff@v1.11.4 curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin $(GOLANGCI_VERSION) .PHONY: setup diff --git a/tools/cli/go.mod b/tools/cli/go.mod index bb90d49f3e..b125e5f117 100644 --- a/tools/cli/go.mod +++ b/tools/cli/go.mod @@ -6,16 +6,17 @@ toolchain go1.24.0 require ( github.com/getkin/kin-openapi v0.132.0 + github.com/oasdiff/oasdiff v1.11.4 github.com/spf13/afero v1.14.0 github.com/spf13/cobra v1.9.1 github.com/stretchr/testify v1.10.0 - github.com/tufin/oasdiff v1.10.29 go.uber.org/mock v0.5.2 + golang.org/x/text v0.24.0 gopkg.in/yaml.v3 v3.0.1 ) require ( - cloud.google.com/go v0.118.3 // indirect + cloud.google.com/go v0.121.0 // indirect github.com/TwiN/go-color v1.4.1 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/go-openapi/jsonpointer v0.21.0 // indirect @@ -35,7 +36,6 @@ require ( github.com/tidwall/sjson v1.2.5 // indirect github.com/wI2L/jsondiff v0.6.1 // indirect github.com/yargevad/filepathx v1.0.0 // indirect - github.com/yuin/goldmark v1.7.8 // indirect - golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa // indirect - golang.org/x/text v0.23.0 // indirect + github.com/yuin/goldmark v1.7.11 // indirect + golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect ) diff --git a/tools/cli/go.sum b/tools/cli/go.sum index 40c40b711f..6dec9344fc 100644 --- a/tools/cli/go.sum +++ b/tools/cli/go.sum @@ -1,5 +1,5 @@ -cloud.google.com/go v0.118.3 h1:jsypSnrE/w4mJysioGdMBg4MiW/hHx/sArFpaBWHdME= -cloud.google.com/go v0.118.3/go.mod h1:Lhs3YLnBlwJ4KA6nuObNMZ/fCbOQBPuWKPoE0Wa/9Vc= +cloud.google.com/go v0.121.0 h1:pgfwva8nGw7vivjZiRfrmglGWiCJBP+0OmDpenG/Fwg= +cloud.google.com/go v0.121.0/go.mod h1:rS7Kytwheu/y9buoDmu5EIpMMCI4Mb8ND4aeN4Vwj7Q= github.com/TwiN/go-color v1.4.1 h1:mqG0P/KBgHKVqmtL5ye7K0/Gr4l6hTksPgTgMk3mUzc= github.com/TwiN/go-color v1.4.1/go.mod h1:WcPf/jtiW95WBIsEeY1Lc/b8aaWoiqQpu5cf8WFxu+s= github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= @@ -13,8 +13,8 @@ github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+Gr 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/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/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= @@ -27,6 +27,8 @@ github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4 github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU= 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/oasdiff/oasdiff v1.11.4 h1:FgThY78WNwOhWCLIhMk7AsKoHpVZZggRpKEGfd+IOIs= +github.com/oasdiff/oasdiff v1.11.4/go.mod h1:+bDxqI7wMl30OJ97hBfHR5loUsKCctk9UZOujHl8Gtk= github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 h1:G7ERwszslrBzRxj//JalHPu/3yz+De2J+4aLtSRlHiY= github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037/go.mod h1:2bpvgLBZEtENV5scfDFEtB/5+1M4hkQhDQrccEJ/qGw= github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 h1:bQx3WeLcUWy+RletIKwUIt4x3t8n2SxavmoclizMb8c= @@ -56,22 +58,20 @@ github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4= github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY= github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28= -github.com/tufin/oasdiff v1.10.29 h1:eWPoq0pnDIEKVX1jQ06JPqIVI9m6JUarfo2SCRJk86w= -github.com/tufin/oasdiff v1.10.29/go.mod h1:ATyMKGAf+viL7tGqn1nhOU8r6jb9240zPOQLvHQMULo= github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU= github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= github.com/wI2L/jsondiff v0.6.1 h1:ISZb9oNWbP64LHnu4AUhsMF5W0FIj5Ok3Krip9Shqpw= github.com/wI2L/jsondiff v0.6.1/go.mod h1:KAEIojdQq66oJiHhDyQez2x+sRit0vIzC9KeK0yizxM= github.com/yargevad/filepathx v1.0.0 h1:SYcT+N3tYGi+NvazubCNlvgIPbzAk7i7y2dwg3I5FYc= github.com/yargevad/filepathx v1.0.0/go.mod h1:BprfX/gpYNJHJfc35GjRRpVcwWXS89gGulUIU5tK3tA= -github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic= -github.com/yuin/goldmark v1.7.8/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= +github.com/yuin/goldmark v1.7.11 h1:ZCxLyDMtz0nT2HFfsYG8WZ47Trip2+JyLysKcMYE5bo= +github.com/yuin/goldmark v1.7.11/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg= go.uber.org/mock v0.5.2 h1:LbtPTcP8A5k9WPXj54PPPbjcI4Y6lhyOZXn+VS7wNko= go.uber.org/mock v0.5.2/go.mod h1:wLlUxC2vVTPTaE3UD51E0BGOAElKrILxhVSDYQLld5o= -golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa h1:t2QcU6V556bFjYgu4L6C+6VrCPyJZ+eyRsABUPs1mz4= -golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa/go.mod h1:BHOTPb3L19zxehTsLoJXVaTktb06DFgmdW6Wb9s8jqk= -golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= -golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= +golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 h1:nDVHiLt8aIbd/VzvPWN6kSOPE7+F/fNFDSXLVYkE/Iw= +golang.org/x/exp v0.0.0-20250305212735-054e65f0b394/go.mod h1:sIifuuw/Yco/y6yb6+bDNfyeQ/MdPUy/hKEMYQV17cM= +golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0= +golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU= 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= diff --git a/tools/cli/internal/changelog/changelog.go b/tools/cli/internal/changelog/changelog.go index 5997789b7f..da0dc13c24 100644 --- a/tools/cli/internal/changelog/changelog.go +++ b/tools/cli/internal/changelog/changelog.go @@ -24,9 +24,9 @@ import ( "github.com/mongodb/openapi/tools/cli/internal/apiversion" "github.com/mongodb/openapi/tools/cli/internal/openapi" - "github.com/tufin/oasdiff/checker" - "github.com/tufin/oasdiff/diff" - "github.com/tufin/oasdiff/load" + "github.com/oasdiff/oasdiff/checker" + "github.com/oasdiff/oasdiff/diff" + "github.com/oasdiff/oasdiff/load" ) const ( diff --git a/tools/cli/internal/changelog/manual_entry.go b/tools/cli/internal/changelog/manual_entry.go index 5cde0eafc9..2b83938f6c 100644 --- a/tools/cli/internal/changelog/manual_entry.go +++ b/tools/cli/internal/changelog/manual_entry.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/mongodb/openapi/tools/cli/internal/changelog/outputfilter" - "github.com/tufin/oasdiff/checker" + "github.com/oasdiff/oasdiff/checker" ) const manualChangelogEntry = "manual-changelog-entry" diff --git a/tools/cli/internal/changelog/merge.go b/tools/cli/internal/changelog/merge.go index 780b66e359..bf87ab072f 100644 --- a/tools/cli/internal/changelog/merge.go +++ b/tools/cli/internal/changelog/merge.go @@ -21,7 +21,7 @@ import ( "sort" "github.com/mongodb/openapi/tools/cli/internal/changelog/outputfilter" - "github.com/tufin/oasdiff/checker" + "github.com/oasdiff/oasdiff/checker" ) const ( diff --git a/tools/cli/internal/changelog/outputfilter/operationconfig.go b/tools/cli/internal/changelog/outputfilter/operationconfig.go index 1c1fb9097d..23a64b0614 100644 --- a/tools/cli/internal/changelog/outputfilter/operationconfig.go +++ b/tools/cli/internal/changelog/outputfilter/operationconfig.go @@ -2,7 +2,7 @@ package outputfilter import ( "github.com/getkin/kin-openapi/openapi3" - "github.com/tufin/oasdiff/load" + "github.com/oasdiff/oasdiff/load" ) type OperationConfig struct { diff --git a/tools/cli/internal/changelog/outputfilter/operationconfig_test.go b/tools/cli/internal/changelog/outputfilter/operationconfig_test.go index b570d75c15..dc725ec466 100644 --- a/tools/cli/internal/changelog/outputfilter/operationconfig_test.go +++ b/tools/cli/internal/changelog/outputfilter/operationconfig_test.go @@ -6,8 +6,8 @@ import ( "github.com/getkin/kin-openapi/openapi3" "github.com/mongodb/openapi/tools/cli/internal/openapi" + "github.com/oasdiff/oasdiff/load" "github.com/stretchr/testify/require" - "github.com/tufin/oasdiff/load" ) func TestOpenApiSpecMethods(t *testing.T) { diff --git a/tools/cli/internal/changelog/outputfilter/outputfilter.go b/tools/cli/internal/changelog/outputfilter/outputfilter.go index 084dbcc049..f257ad0cbe 100644 --- a/tools/cli/internal/changelog/outputfilter/outputfilter.go +++ b/tools/cli/internal/changelog/outputfilter/outputfilter.go @@ -16,10 +16,10 @@ package outputfilter import ( "encoding/json" + "github.com/oasdiff/oasdiff/checker" + "github.com/oasdiff/oasdiff/formatters" + "github.com/oasdiff/oasdiff/load" "github.com/spf13/afero" - "github.com/tufin/oasdiff/checker" - "github.com/tufin/oasdiff/formatters" - "github.com/tufin/oasdiff/load" ) const lan = "en" // language for localized output @@ -52,7 +52,8 @@ func NewChangelogEntries(checkers checker.Changes, specInfoPair *load.SpecInfoPa return nil, err } - bytes, err := formatter.RenderChangelog(checkers, formatters.RenderOpts{ColorMode: checker.ColorAuto}, specInfoPair) + bytes, err := formatter.RenderChangelog(checkers, formatters.RenderOpts{ColorMode: checker.ColorAuto}, + specInfoPair.Base.Version, specInfoPair.Revision.Version) if err != nil { return nil, err } diff --git a/tools/cli/internal/changelog/sunset.go b/tools/cli/internal/changelog/sunset.go index 63aba1a777..fbf067fd3e 100644 --- a/tools/cli/internal/changelog/sunset.go +++ b/tools/cli/internal/changelog/sunset.go @@ -21,7 +21,7 @@ import ( "time" "github.com/mongodb/openapi/tools/cli/internal/changelog/outputfilter" - "github.com/tufin/oasdiff/checker" + "github.com/oasdiff/oasdiff/checker" ) const endpointRemovedCode = "endpoint-removed" diff --git a/tools/cli/internal/cli/filter/filter_test.go b/tools/cli/internal/cli/filter/filter_test.go index 456be5b321..783f41c920 100644 --- a/tools/cli/internal/cli/filter/filter_test.go +++ b/tools/cli/internal/cli/filter/filter_test.go @@ -20,9 +20,9 @@ import ( "github.com/getkin/kin-openapi/openapi3" "github.com/mongodb/openapi/tools/cli/internal/openapi" + "github.com/oasdiff/oasdiff/load" "github.com/spf13/afero" "github.com/stretchr/testify/require" - "github.com/tufin/oasdiff/load" ) func TestSuccessfulFilter_Run(t *testing.T) { diff --git a/tools/cli/internal/cli/split/split_test.go b/tools/cli/internal/cli/split/split_test.go index 12b3239a88..983b71e095 100644 --- a/tools/cli/internal/cli/split/split_test.go +++ b/tools/cli/internal/cli/split/split_test.go @@ -20,9 +20,9 @@ import ( "github.com/getkin/kin-openapi/openapi3" "github.com/mongodb/openapi/tools/cli/internal/openapi" + "github.com/oasdiff/oasdiff/load" "github.com/spf13/afero" "github.com/stretchr/testify/require" - "github.com/tufin/oasdiff/load" ) func TestSuccessfulSplit_Run(t *testing.T) { diff --git a/tools/cli/internal/openapi/errors/merge_conflict_error.go b/tools/cli/internal/openapi/errors/merge_conflict_error.go index cef6923a03..1a1f170834 100644 --- a/tools/cli/internal/openapi/errors/merge_conflict_error.go +++ b/tools/cli/internal/openapi/errors/merge_conflict_error.go @@ -18,7 +18,7 @@ import ( "encoding/json" "fmt" - "github.com/tufin/oasdiff/diff" + "github.com/oasdiff/oasdiff/diff" ) type ParamConflictError struct { diff --git a/tools/cli/internal/openapi/mock_oasdiff_result.go b/tools/cli/internal/openapi/mock_oasdiff_result.go index 99c9074ab8..825b8f1d1b 100644 --- a/tools/cli/internal/openapi/mock_oasdiff_result.go +++ b/tools/cli/internal/openapi/mock_oasdiff_result.go @@ -13,8 +13,8 @@ import ( reflect "reflect" openapi3 "github.com/getkin/kin-openapi/openapi3" - diff "github.com/tufin/oasdiff/diff" - load "github.com/tufin/oasdiff/load" + diff "github.com/oasdiff/oasdiff/diff" + load "github.com/oasdiff/oasdiff/load" gomock "go.uber.org/mock/gomock" ) diff --git a/tools/cli/internal/openapi/mock_openapi.go b/tools/cli/internal/openapi/mock_openapi.go index ae8bad152c..f41622cd46 100644 --- a/tools/cli/internal/openapi/mock_openapi.go +++ b/tools/cli/internal/openapi/mock_openapi.go @@ -12,7 +12,7 @@ package openapi import ( reflect "reflect" - load "github.com/tufin/oasdiff/load" + load "github.com/oasdiff/oasdiff/load" gomock "go.uber.org/mock/gomock" ) diff --git a/tools/cli/internal/openapi/oasdiff.go b/tools/cli/internal/openapi/oasdiff.go index c61426efbc..3ab47a3138 100644 --- a/tools/cli/internal/openapi/oasdiff.go +++ b/tools/cli/internal/openapi/oasdiff.go @@ -21,8 +21,8 @@ import ( "github.com/getkin/kin-openapi/openapi3" "github.com/mongodb/openapi/tools/cli/internal/openapi/errors" - "github.com/tufin/oasdiff/diff" - "github.com/tufin/oasdiff/load" + "github.com/oasdiff/oasdiff/diff" + "github.com/oasdiff/oasdiff/load" ) type OasDiff struct { diff --git a/tools/cli/internal/openapi/oasdiff_result.go b/tools/cli/internal/openapi/oasdiff_result.go index d2bee9cf48..c3b7d029a4 100644 --- a/tools/cli/internal/openapi/oasdiff_result.go +++ b/tools/cli/internal/openapi/oasdiff_result.go @@ -17,9 +17,9 @@ package openapi //go:generate mockgen -destination=../openapi/mock_oasdiff_result.go -package=openapi github.com/mongodb/openapi/tools/cli/internal/openapi DiffGetter import ( "github.com/getkin/kin-openapi/openapi3" - "github.com/tufin/oasdiff/diff" - "github.com/tufin/oasdiff/flatten/allof" - "github.com/tufin/oasdiff/load" + "github.com/oasdiff/oasdiff/diff" + "github.com/oasdiff/oasdiff/flatten/allof" + "github.com/oasdiff/oasdiff/load" ) // DiffGetter defines an interface for getting diffs. diff --git a/tools/cli/internal/openapi/oasdiff_result_test.go b/tools/cli/internal/openapi/oasdiff_result_test.go index c684536155..8711565714 100644 --- a/tools/cli/internal/openapi/oasdiff_result_test.go +++ b/tools/cli/internal/openapi/oasdiff_result_test.go @@ -19,9 +19,9 @@ import ( "testing" "github.com/getkin/kin-openapi/openapi3" + "github.com/oasdiff/oasdiff/diff" + "github.com/oasdiff/oasdiff/load" "github.com/stretchr/testify/require" - "github.com/tufin/oasdiff/diff" - "github.com/tufin/oasdiff/load" gomock "go.uber.org/mock/gomock" ) diff --git a/tools/cli/internal/openapi/oasdiff_test.go b/tools/cli/internal/openapi/oasdiff_test.go index e114b2ebbe..c9d2a38d8d 100644 --- a/tools/cli/internal/openapi/oasdiff_test.go +++ b/tools/cli/internal/openapi/oasdiff_test.go @@ -21,11 +21,11 @@ import ( "github.com/getkin/kin-openapi/openapi3" "github.com/mongodb/openapi/tools/cli/internal/openapi/errors" "github.com/mongodb/openapi/tools/cli/internal/pointer" + "github.com/oasdiff/oasdiff/diff" + "github.com/oasdiff/oasdiff/load" + "github.com/oasdiff/oasdiff/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tufin/oasdiff/diff" - "github.com/tufin/oasdiff/load" - "github.com/tufin/oasdiff/utils" gomock "go.uber.org/mock/gomock" ) diff --git a/tools/cli/internal/openapi/openapi.go b/tools/cli/internal/openapi/openapi.go index 6f15152150..6c5e4b7576 100644 --- a/tools/cli/internal/openapi/openapi.go +++ b/tools/cli/internal/openapi/openapi.go @@ -20,8 +20,8 @@ import ( "log" "github.com/getkin/kin-openapi/openapi3" - "github.com/tufin/oasdiff/diff" - "github.com/tufin/oasdiff/load" + "github.com/oasdiff/oasdiff/diff" + "github.com/oasdiff/oasdiff/load" ) // Spec is a struct is a 1-to-1 copy of the Spec struct in the openapi3 package. diff --git a/tools/cli/internal/openapi/openapi3.go b/tools/cli/internal/openapi/openapi3.go index 0bf01b790c..86befd11ad 100644 --- a/tools/cli/internal/openapi/openapi3.go +++ b/tools/cli/internal/openapi/openapi3.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/getkin/kin-openapi/openapi3" - "github.com/tufin/oasdiff/load" + "github.com/oasdiff/oasdiff/load" ) const publicPathPrefix = "api/atlas/v2" diff --git a/tools/cli/internal/openapi/sunset/sunset.go b/tools/cli/internal/openapi/sunset/sunset.go index f29abfc8b3..9791f88e2c 100644 --- a/tools/cli/internal/openapi/sunset/sunset.go +++ b/tools/cli/internal/openapi/sunset/sunset.go @@ -21,7 +21,7 @@ import ( "sort" "github.com/getkin/kin-openapi/openapi3" - "github.com/tufin/oasdiff/load" + "github.com/oasdiff/oasdiff/load" ) const ( diff --git a/tools/cli/internal/openapi/sunset/sunset_test.go b/tools/cli/internal/openapi/sunset/sunset_test.go index b300931064..dc9e33f136 100644 --- a/tools/cli/internal/openapi/sunset/sunset_test.go +++ b/tools/cli/internal/openapi/sunset/sunset_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/getkin/kin-openapi/openapi3" + "github.com/oasdiff/oasdiff/load" "github.com/stretchr/testify/assert" - "github.com/tufin/oasdiff/load" ) func TestNewSunsetListFromSpec(t *testing.T) { diff --git a/tools/cli/test/data/changelog/new-upcoming-version/output/2024-05-30_2025-09-22.upcoming.json b/tools/cli/test/data/changelog/new-upcoming-version/output/2024-05-30_2025-09-22.upcoming.json index 07d17f55f6..ccc15f4bda 100644 --- a/tools/cli/test/data/changelog/new-upcoming-version/output/2024-05-30_2025-09-22.upcoming.json +++ b/tools/cli/test/data/changelog/new-upcoming-version/output/2024-05-30_2025-09-22.upcoming.json @@ -6,13 +6,8 @@ "tag": "OpenAPI", "changes": [ { - "change": "removed the media type 'application/json' for the response with the status '200'", - "changeCode": "response-media-type-removed", - "backwardCompatible": false - }, - { - "change": "added the media type 'application/vnd.atlas.2025-09-22.upcoming+json' for the response with the status '200'", - "changeCode": "response-media-type-added", + "change": "media type 'application/json' was changed to a more specific media type 'application/vnd.atlas.2025-09-22.upcoming+json' for the response status '200'", + "changeCode": "response-media-type-name-specialized", "backwardCompatible": true } ] diff --git a/tools/cli/test/data/changelog/new-upcoming-version/output/2024-08-05_2025-09-22.upcoming.json b/tools/cli/test/data/changelog/new-upcoming-version/output/2024-08-05_2025-09-22.upcoming.json index 07d17f55f6..ccc15f4bda 100644 --- a/tools/cli/test/data/changelog/new-upcoming-version/output/2024-08-05_2025-09-22.upcoming.json +++ b/tools/cli/test/data/changelog/new-upcoming-version/output/2024-08-05_2025-09-22.upcoming.json @@ -6,13 +6,8 @@ "tag": "OpenAPI", "changes": [ { - "change": "removed the media type 'application/json' for the response with the status '200'", - "changeCode": "response-media-type-removed", - "backwardCompatible": false - }, - { - "change": "added the media type 'application/vnd.atlas.2025-09-22.upcoming+json' for the response with the status '200'", - "changeCode": "response-media-type-added", + "change": "media type 'application/json' was changed to a more specific media type 'application/vnd.atlas.2025-09-22.upcoming+json' for the response status '200'", + "changeCode": "response-media-type-name-specialized", "backwardCompatible": true } ] diff --git a/tools/cli/test/data/changelog/new-upcoming-version/output/2024-10-23_2025-09-22.upcoming.json b/tools/cli/test/data/changelog/new-upcoming-version/output/2024-10-23_2025-09-22.upcoming.json index 07d17f55f6..ccc15f4bda 100644 --- a/tools/cli/test/data/changelog/new-upcoming-version/output/2024-10-23_2025-09-22.upcoming.json +++ b/tools/cli/test/data/changelog/new-upcoming-version/output/2024-10-23_2025-09-22.upcoming.json @@ -6,13 +6,8 @@ "tag": "OpenAPI", "changes": [ { - "change": "removed the media type 'application/json' for the response with the status '200'", - "changeCode": "response-media-type-removed", - "backwardCompatible": false - }, - { - "change": "added the media type 'application/vnd.atlas.2025-09-22.upcoming+json' for the response with the status '200'", - "changeCode": "response-media-type-added", + "change": "media type 'application/json' was changed to a more specific media type 'application/vnd.atlas.2025-09-22.upcoming+json' for the response status '200'", + "changeCode": "response-media-type-name-specialized", "backwardCompatible": true } ] diff --git a/tools/cli/test/data/changelog/new-upcoming-version/output/2024-11-13_2025-09-22.upcoming.json b/tools/cli/test/data/changelog/new-upcoming-version/output/2024-11-13_2025-09-22.upcoming.json index 07d17f55f6..ccc15f4bda 100644 --- a/tools/cli/test/data/changelog/new-upcoming-version/output/2024-11-13_2025-09-22.upcoming.json +++ b/tools/cli/test/data/changelog/new-upcoming-version/output/2024-11-13_2025-09-22.upcoming.json @@ -6,13 +6,8 @@ "tag": "OpenAPI", "changes": [ { - "change": "removed the media type 'application/json' for the response with the status '200'", - "changeCode": "response-media-type-removed", - "backwardCompatible": false - }, - { - "change": "added the media type 'application/vnd.atlas.2025-09-22.upcoming+json' for the response with the status '200'", - "changeCode": "response-media-type-added", + "change": "media type 'application/json' was changed to a more specific media type 'application/vnd.atlas.2025-09-22.upcoming+json' for the response status '200'", + "changeCode": "response-media-type-name-specialized", "backwardCompatible": true } ] diff --git a/tools/cli/test/data/changelog/new-upcoming-version/output/2025-02-19_2025-09-22.upcoming.json b/tools/cli/test/data/changelog/new-upcoming-version/output/2025-02-19_2025-09-22.upcoming.json index 07d17f55f6..ccc15f4bda 100644 --- a/tools/cli/test/data/changelog/new-upcoming-version/output/2025-02-19_2025-09-22.upcoming.json +++ b/tools/cli/test/data/changelog/new-upcoming-version/output/2025-02-19_2025-09-22.upcoming.json @@ -6,13 +6,8 @@ "tag": "OpenAPI", "changes": [ { - "change": "removed the media type 'application/json' for the response with the status '200'", - "changeCode": "response-media-type-removed", - "backwardCompatible": false - }, - { - "change": "added the media type 'application/vnd.atlas.2025-09-22.upcoming+json' for the response with the status '200'", - "changeCode": "response-media-type-added", + "change": "media type 'application/json' was changed to a more specific media type 'application/vnd.atlas.2025-09-22.upcoming+json' for the response status '200'", + "changeCode": "response-media-type-name-specialized", "backwardCompatible": true } ] diff --git a/tools/cli/test/data/changelog/new-upcoming-version/output/2025-03-12_2025-09-22.upcoming.json b/tools/cli/test/data/changelog/new-upcoming-version/output/2025-03-12_2025-09-22.upcoming.json index 07d17f55f6..ccc15f4bda 100644 --- a/tools/cli/test/data/changelog/new-upcoming-version/output/2025-03-12_2025-09-22.upcoming.json +++ b/tools/cli/test/data/changelog/new-upcoming-version/output/2025-03-12_2025-09-22.upcoming.json @@ -6,13 +6,8 @@ "tag": "OpenAPI", "changes": [ { - "change": "removed the media type 'application/json' for the response with the status '200'", - "changeCode": "response-media-type-removed", - "backwardCompatible": false - }, - { - "change": "added the media type 'application/vnd.atlas.2025-09-22.upcoming+json' for the response with the status '200'", - "changeCode": "response-media-type-added", + "change": "media type 'application/json' was changed to a more specific media type 'application/vnd.atlas.2025-09-22.upcoming+json' for the response status '200'", + "changeCode": "response-media-type-name-specialized", "backwardCompatible": true } ] diff --git a/tools/cli/test/e2e/cli/split_test.go b/tools/cli/test/e2e/cli/split_test.go index 5e06f46072..ba3d66dee8 100755 --- a/tools/cli/test/e2e/cli/split_test.go +++ b/tools/cli/test/e2e/cli/split_test.go @@ -15,8 +15,8 @@ import ( "github.com/getkin/kin-openapi/openapi3" "github.com/mongodb/openapi/tools/cli/internal/apiversion" + "github.com/oasdiff/oasdiff/diff" "github.com/stretchr/testify/require" - "github.com/tufin/oasdiff/diff" ) var skipVersions = []string{}