Skip to content

Commit 4af4e4d

Browse files
authored
Upgrade oapi-codegen and generate (#14)
* Upgrade oapi-codegen and generate * Fix codeowners
1 parent cc3f0f8 commit 4af4e4d

File tree

9 files changed

+303
-79
lines changed

9 files changed

+303
-79
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
- @diogopms @skirsten @philipkrueck
1+
@diogopms @skirsten @philipkrueck

client.gen.go

Lines changed: 118 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package genesiscloud
33
import (
44
"fmt"
55

6-
"github.com/deepmap/oapi-codegen/pkg/securityprovider"
6+
"github.com/oapi-codegen/oapi-codegen/v2/pkg/securityprovider"
77
)
88

99
const DefaultEndpoint = "https://api.genesiscloud.com/compute/v1"

codegen/codegen.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
package codegen
22

3-
//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --config=config/types.yaml https://api.genesiscloud.com/compute/v1/openapi.yaml
4-
//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --config=config/client.yaml https://api.genesiscloud.com/compute/v1/openapi.yaml
3+
//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config/types.yaml https://api.genesiscloud.com/compute/v1/openapi.yaml
4+
//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config/client.yaml https://api.genesiscloud.com/compute/v1/openapi.yaml

codegen/config/types.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ generate:
44
output: ../types.gen.go # relative to codegen.go
55
output-options:
66
user-templates:
7-
# extended from https://github.com/deepmap/oapi-codegen/blob/f4cf8f9a570380c24c6ba03ae04b9393cf120692/pkg/codegen/templates/constants.tmpl
7+
# extended from https://github.com/oapi-codegen/oapi-codegen/blob/fd1f9b3e448846c1c4749f5c7eaae60e2be7a02c/pkg/codegen/templates/constants.tmpl
88
constants.tmpl: |
99
{{- if gt (len .SecuritySchemeProviderNames) 0 }}
1010
const (

go.mod

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,31 @@
11
module github.com/genesiscloud/genesiscloud-go
22

3-
go 1.19
3+
go 1.21.0
4+
5+
toolchain go1.23.1
46

57
require (
6-
github.com/deepmap/oapi-codegen v1.14.0
7-
github.com/oapi-codegen/runtime v1.0.0
8+
github.com/oapi-codegen/oapi-codegen/v2 v2.4.1
9+
github.com/oapi-codegen/runtime v1.1.1
810
)
911

1012
require (
1113
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
12-
github.com/getkin/kin-openapi v0.118.0 // indirect
13-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
14-
github.com/go-openapi/swag v0.21.1 // indirect
15-
github.com/google/uuid v1.3.1 // indirect
16-
github.com/invopop/yaml v0.1.0 // indirect
14+
github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 // indirect
15+
github.com/getkin/kin-openapi v0.127.0 // indirect
16+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
17+
github.com/go-openapi/swag v0.23.0 // indirect
18+
github.com/google/uuid v1.5.0 // indirect
19+
github.com/invopop/yaml v0.3.1 // indirect
1720
github.com/josharian/intern v1.0.0 // indirect
1821
github.com/mailru/easyjson v0.7.7 // indirect
1922
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
20-
github.com/perimeterx/marshmallow v1.1.4 // indirect
21-
golang.org/x/mod v0.12.0 // indirect
22-
golang.org/x/sys v0.12.0 // indirect
23-
golang.org/x/text v0.13.0 // indirect
24-
golang.org/x/tools v0.12.0 // indirect
25-
gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
23+
github.com/perimeterx/marshmallow v1.1.5 // indirect
24+
github.com/speakeasy-api/openapi-overlay v0.9.0 // indirect
25+
github.com/vmware-labs/yaml-jsonpath v0.3.2 // indirect
26+
golang.org/x/mod v0.17.0 // indirect
27+
golang.org/x/text v0.18.0 // indirect
28+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
2629
gopkg.in/yaml.v2 v2.4.0 // indirect
2730
gopkg.in/yaml.v3 v3.0.1 // indirect
2831
)

0 commit comments

Comments
 (0)