Skip to content

Commit

Permalink
go.mod: update github.com/deepmap/oapi-codegen to 1.11
Browse files Browse the repository at this point in the history
Oh my, what an update. Lemme list what needed to be fixed:

- github.com/getkin/kin-openapi v0.61.0 renamed some methods, we needed to
  adjust (mostly openapi3.Swagger and openapi3.NewSwaggerLoader)

- github.com/deepmap/oapi-codegen v1.11.0 removed configuration by arguments,
  so I had to create server.cfg.yaml and client.cfg.yaml

- otherwise, enums are now generated differently, so this had to be adjusted
  and also uuids are nowadays natively supported, so they required changes
  as well
  • Loading branch information
ondrejbudai authored and croissanne committed Sep 5, 2022
1 parent fd44fa1 commit 03b130c
Show file tree
Hide file tree
Showing 177 changed files with 20,959 additions and 3,716 deletions.
27 changes: 13 additions & 14 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ go 1.17

require (
github.com/aws/aws-sdk-go v1.44.91
github.com/deepmap/oapi-codegen v1.3.12
github.com/getkin/kin-openapi v0.53.0
github.com/deepmap/oapi-codegen v1.11.0
github.com/getkin/kin-openapi v0.94.0
github.com/golang-migrate/migrate/v4 v4.15.2
github.com/google/uuid v1.3.0
github.com/jackc/pgx/v4 v4.10.1
github.com/labstack/echo/v4 v4.1.11
github.com/labstack/echo/v4 v4.7.2
github.com/prometheus/client_golang v1.13.0
github.com/redhatinsights/identity v0.0.0-20220426090913-8179bb5bfb20
github.com/redhatinsights/platform-go-middlewares v0.20.0
github.com/sirupsen/logrus v1.8.1
github.com/stretchr/testify v1.7.0
github.com/stretchr/testify v1.7.1
)

require (
Expand All @@ -23,7 +23,7 @@ require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
github.com/go-openapi/swag v0.21.1 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
Expand All @@ -37,25 +37,24 @@ require (
github.com/jackc/puddle v1.1.3 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/labstack/gommon v0.3.0 // indirect
github.com/labstack/gommon v0.3.1 // indirect
github.com/lib/pq v1.10.0 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/mattn/go-colorable v0.1.6 // indirect
github.com/mattn/go-isatty v0.0.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasttemplate v1.1.0 // indirect
github.com/valyala/fasttemplate v1.2.1 // indirect
go.uber.org/atomic v1.7.0 // indirect
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
golang.org/x/crypto v0.0.0-20220513210258-46612604a0f9 // indirect
golang.org/x/net v0.0.0-20220513224357-95641704303c // indirect
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
Expand Down
107 changes: 81 additions & 26 deletions go.sum

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions internal/composer/client.cfg.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package: composer
output: openapi.v2.gen.go
generate:
models: true
2 changes: 1 addition & 1 deletion internal/composer/client.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//go:generate go run -mod=mod github.com/deepmap/oapi-codegen/cmd/oapi-codegen --package=composer --generate types -o openapi.v2.gen.go openapi.v2.yml
//go:generate go run -mod=mod github.com/deepmap/oapi-codegen/cmd/oapi-codegen --config client.cfg.yaml openapi.v2.yml

package composer

Expand Down
Loading

0 comments on commit 03b130c

Please sign in to comment.