Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tools/cli/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ toolchain go1.26.0

require (
github.com/getkin/kin-openapi v0.140.0
github.com/iancoleman/strcase v0.3.0
github.com/oasdiff/oasdiff v1.18.6
github.com/iancoleman/strcase v0.3.0 // indirect
github.com/oasdiff/oasdiff v1.19.1
github.com/spf13/afero v1.15.0
github.com/spf13/cobra v1.10.2
github.com/stretchr/testify v1.11.1
go.uber.org/mock v0.6.0
golang.org/x/text v0.38.0
golang.org/x/text v0.38.0 // indirect
gopkg.in/yaml.v3 v3.0.1
)

Expand All @@ -29,10 +29,10 @@ require (
github.com/go-openapi/jsonpointer v0.22.5 // indirect
github.com/go-openapi/swag/jsonname v0.25.5 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/oasdiff/yaml v0.1.0 // indirect
github.com/oasdiff/yaml3 v0.0.13 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
github.com/spf13/pflag v1.0.10 // indirect
github.com/tidwall/gjson v1.18.0 // indirect
Expand Down
6 changes: 2 additions & 4 deletions tools/cli/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ cloud.google.com/go v0.123.0/go.mod h1:xBoMV08QcqUGuPW65Qfm1o9Y4zKZBpGS+7bImXLTA
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=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
Expand All @@ -26,13 +25,12 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/oasdiff/oasdiff v1.18.6 h1:Zc9YxkAhJiHQaftDXFKRNS1iwPZz/lkLXX6Fs3Hdqm8=
github.com/oasdiff/oasdiff v1.18.6/go.mod h1:eColoNHeEiWTsztKtZ+39xTEz+sHl/OSW4EbjYP8A1Y=
github.com/oasdiff/oasdiff v1.19.1 h1:JzeFKqUZYIAydr43E8C7Y5CoVQtMEwOUu0cu5uEiBjI=
github.com/oasdiff/oasdiff v1.19.1/go.mod h1:eColoNHeEiWTsztKtZ+39xTEz+sHl/OSW4EbjYP8A1Y=
github.com/oasdiff/yaml v0.1.0 h1:0bqZjfKc/8S9urj4JuwepX41WX9EoA6ifhU3SV06cXg=
github.com/oasdiff/yaml v0.1.0/go.mod h1:kOlRmMdL2X3vucLCEQO5u61SU22RysnfXvcttrZA1O0=
github.com/oasdiff/yaml3 v0.0.13 h1:06svmvOHOVBqF81+sY2EUScvUI/iS/vl2VIeUUxZQwg=
github.com/oasdiff/yaml3 v0.0.13/go.mod h1:y5+oSEHCPT/DGrS++Wc/479ERge0zTFxaF8PbGKcg2o=
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ package exemptions
import (
"errors"

"github.com/mongodb/openapi/tools/cli/internal/breakingchanges"
"github.com/mongodb/openapi/tools/cli/internal/cli/flag"
"github.com/mongodb/openapi/tools/cli/internal/cli/usage"
"github.com/mongodb/openapi/tools/foas/breakingchanges"
"github.com/spf13/afero"
"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion tools/cli/internal/cli/changelog/convert/slack.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"sort"
"strconv"

"github.com/mongodb/openapi/tools/cli/internal/changelog"
"github.com/mongodb/openapi/tools/cli/internal/cli/flag"
"github.com/mongodb/openapi/tools/cli/internal/cli/usage"
"github.com/mongodb/openapi/tools/foas/changelog"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions tools/cli/internal/cli/changelog/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import (
"log"
"time"

"github.com/mongodb/openapi/tools/cli/internal/changelog"
"github.com/mongodb/openapi/tools/cli/internal/cli/flag"
"github.com/mongodb/openapi/tools/cli/internal/cli/usage"
"github.com/mongodb/openapi/tools/cli/internal/openapi"
"github.com/mongodb/openapi/tools/foas/changelog"
"github.com/mongodb/openapi/tools/foas/openapi"
"github.com/spf13/afero"
"github.com/spf13/cobra"
)
Expand Down
4 changes: 2 additions & 2 deletions tools/cli/internal/cli/changelog/metadata/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ import (
"fmt"
"time"

"github.com/mongodb/openapi/tools/cli/internal/changelog"
"github.com/mongodb/openapi/tools/cli/internal/cli/flag"
"github.com/mongodb/openapi/tools/cli/internal/cli/usage"
"github.com/mongodb/openapi/tools/cli/internal/openapi"
"github.com/mongodb/openapi/tools/foas/apiversion"
"github.com/mongodb/openapi/tools/foas/changelog"
"github.com/mongodb/openapi/tools/foas/openapi"
"github.com/spf13/afero"
"github.com/spf13/cobra"
)
Expand Down
4 changes: 2 additions & 2 deletions tools/cli/internal/cli/filter/filter.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"github.com/getkin/kin-openapi/openapi3"
"github.com/mongodb/openapi/tools/cli/internal/cli/flag"
"github.com/mongodb/openapi/tools/cli/internal/cli/usage"
"github.com/mongodb/openapi/tools/cli/internal/openapi"
"github.com/mongodb/openapi/tools/cli/internal/openapi/filter"
"github.com/mongodb/openapi/tools/foas/apiversion"
"github.com/mongodb/openapi/tools/foas/openapi"
"github.com/mongodb/openapi/tools/foas/openapi/filter"
"github.com/spf13/afero"
"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion tools/cli/internal/cli/filter/filter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"testing"

"github.com/getkin/kin-openapi/openapi3"
"github.com/mongodb/openapi/tools/cli/internal/openapi"
"github.com/mongodb/openapi/tools/foas/openapi"
"github.com/oasdiff/oasdiff/load"
"github.com/spf13/afero"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion tools/cli/internal/cli/merge/merge.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

"github.com/mongodb/openapi/tools/cli/internal/cli/flag"
"github.com/mongodb/openapi/tools/cli/internal/cli/usage"
"github.com/mongodb/openapi/tools/cli/internal/openapi"
"github.com/mongodb/openapi/tools/foas/openapi"
"github.com/spf13/afero"
"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion tools/cli/internal/cli/merge/merge_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

"github.com/getkin/kin-openapi/openapi3"
"github.com/mongodb/openapi/tools/cli/internal/cli/flag"
"github.com/mongodb/openapi/tools/cli/internal/openapi"
"github.com/mongodb/openapi/tools/foas/openapi"
"github.com/spf13/afero"
"github.com/stretchr/testify/require"
"go.uber.org/mock/gomock"
Expand Down
4 changes: 2 additions & 2 deletions tools/cli/internal/cli/slice/slice.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (

"github.com/mongodb/openapi/tools/cli/internal/cli/flag"
"github.com/mongodb/openapi/tools/cli/internal/cli/usage"
"github.com/mongodb/openapi/tools/cli/internal/openapi"
"github.com/mongodb/openapi/tools/cli/internal/openapi/slice"
"github.com/mongodb/openapi/tools/foas/openapi"
"github.com/mongodb/openapi/tools/foas/openapi/slice"
"github.com/spf13/afero"
"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion tools/cli/internal/cli/split/split.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/mongodb/openapi/tools/cli/internal/cli/filter"
"github.com/mongodb/openapi/tools/cli/internal/cli/flag"
"github.com/mongodb/openapi/tools/cli/internal/cli/usage"
"github.com/mongodb/openapi/tools/cli/internal/openapi"
"github.com/mongodb/openapi/tools/foas/openapi"
"github.com/spf13/afero"
"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion tools/cli/internal/cli/split/split_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"testing"

"github.com/getkin/kin-openapi/openapi3"
"github.com/mongodb/openapi/tools/cli/internal/openapi"
"github.com/mongodb/openapi/tools/foas/openapi"
"github.com/oasdiff/oasdiff/load"
"github.com/spf13/afero"
"github.com/stretchr/testify/require"
Expand Down
4 changes: 2 additions & 2 deletions tools/cli/internal/cli/sunset/diff.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (

"github.com/mongodb/openapi/tools/cli/internal/cli/flag"
"github.com/mongodb/openapi/tools/cli/internal/cli/usage"
"github.com/mongodb/openapi/tools/cli/internal/openapi"
"github.com/mongodb/openapi/tools/cli/internal/openapi/sunset"
"github.com/mongodb/openapi/tools/foas/openapi"
"github.com/mongodb/openapi/tools/foas/openapi/sunset"
"github.com/spf13/afero"
"github.com/spf13/cobra"
"gopkg.in/yaml.v3"
Expand Down
2 changes: 1 addition & 1 deletion tools/cli/internal/cli/sunset/diff_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"testing"
"time"

"github.com/mongodb/openapi/tools/cli/internal/openapi/sunset"
"github.com/mongodb/openapi/tools/foas/openapi/sunset"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
4 changes: 2 additions & 2 deletions tools/cli/internal/cli/sunset/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (

"github.com/mongodb/openapi/tools/cli/internal/cli/flag"
"github.com/mongodb/openapi/tools/cli/internal/cli/usage"
"github.com/mongodb/openapi/tools/cli/internal/openapi"
"github.com/mongodb/openapi/tools/cli/internal/openapi/sunset"
"github.com/mongodb/openapi/tools/foas/openapi"
"github.com/mongodb/openapi/tools/foas/openapi/sunset"
"github.com/spf13/afero"
"github.com/spf13/cobra"
"gopkg.in/yaml.v3"
Expand Down
2 changes: 1 addition & 1 deletion tools/cli/internal/cli/sunset/list_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"reflect"
"testing"

"github.com/mongodb/openapi/tools/cli/internal/openapi/sunset"
"github.com/mongodb/openapi/tools/foas/openapi/sunset"
"github.com/spf13/afero"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion tools/cli/internal/cli/versions/versions.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (

"github.com/mongodb/openapi/tools/cli/internal/cli/flag"
"github.com/mongodb/openapi/tools/cli/internal/cli/usage"
"github.com/mongodb/openapi/tools/cli/internal/openapi"
"github.com/mongodb/openapi/tools/foas/apiversion"
"github.com/mongodb/openapi/tools/foas/openapi"
"github.com/spf13/afero"
"github.com/spf13/cobra"
"gopkg.in/yaml.v3"
Expand Down
66 changes: 0 additions & 66 deletions tools/cli/pkg/openapi/openapi.go

This file was deleted.

2 changes: 1 addition & 1 deletion tools/cli/test/e2e/cli/changelog_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"strings"
"testing"

"github.com/mongodb/openapi/tools/cli/internal/changelog"
"github.com/mongodb/openapi/tools/foas/changelog"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion tools/cli/test/e2e/cli/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"testing"

"github.com/getkin/kin-openapi/openapi3"
"github.com/mongodb/openapi/tools/cli/internal/openapi"
"github.com/mongodb/openapi/tools/foas/openapi"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
)

func TestGenerateExemptionsFileWithFs(t *testing.T) {
exemptionsFolder, err := filepath.Abs("../../test/data/exemptions")
exemptionsFolder, err := filepath.Abs("../test/data/exemptions")
require.NoError(t, err)
fs := afero.NewOsFs()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"strings"
"time"

"github.com/mongodb/openapi/tools/cli/internal/openapi"
"github.com/mongodb/openapi/tools/foas/apiversion"
"github.com/mongodb/openapi/tools/foas/openapi"
"github.com/oasdiff/oasdiff/checker"
"github.com/oasdiff/oasdiff/diff"
"github.com/oasdiff/oasdiff/load"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"log"
"strings"

"github.com/mongodb/openapi/tools/cli/internal/changelog/outputfilter"
"github.com/mongodb/openapi/tools/foas/changelog/outputfilter"
"github.com/oasdiff/oasdiff/checker"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package changelog
import (
"testing"

"github.com/mongodb/openapi/tools/cli/internal/changelog/outputfilter"
"github.com/mongodb/openapi/tools/foas/changelog/outputfilter"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"log"
"sort"

"github.com/mongodb/openapi/tools/cli/internal/changelog/outputfilter"
"github.com/mongodb/openapi/tools/foas/changelog/outputfilter"
"github.com/oasdiff/oasdiff/checker"
)

Expand Down
Loading
Loading