Skip to content

Commit a7dbb0f

Browse files
tobiotobio
committed
Move oapi-codegen to a go.mod managed tool
1 parent be99981 commit a7dbb0f

File tree

9 files changed

+128
-90
lines changed

9 files changed

+128
-90
lines changed

‎Makefile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,6 @@ tools: $(GOBIN) tools-golangci-lint ## Install useful tools for linting, docs ge
249249
@ cd tools && go install github.com/client9/misspell/cmd/misspell
250250
@ cd tools && go install github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs
251251
@ cd tools && go install github.com/goreleaser/goreleaser/v2
252-
@ cd tools && go install github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen
253252

254253
.PHONY: tools-golangci-lint
255254
tools-golangci-lint: ## Download golangci-lint locally if necessary.

‎generated/connectors/connectors.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package connectors
2+
3+
//go:generate go tool github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -package connectors -o ./connectors.gen.go -generate "types,client" ./bundled.yaml

‎generated/kbapi/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ oas_url := https://raw.githubusercontent.com/elastic/kibana/$(github_ref)/oas
77

88
.PHONY: all
99
all: download transform generate ## Fetch, bundle, transform, and generate the API
10-
10+
1111

1212
.PHONY: download
1313
download: oas.yaml ## Download the remote schema
1414

15-
oas.yaml:
15+
oas.yaml:
1616
curl -sSfo oas.yaml "$(oas_url)"
1717

1818
.PHONY: transform
@@ -21,7 +21,7 @@ transform: download ## Transform and filter the schema
2121

2222
.PHONY: generate
2323
generate: ## Generate the API
24-
go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@v2.4.1 -config oapi-config.yaml ./oas-filtered.yaml
24+
go tool github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config oapi-config.yaml ./oas-filtered.yaml
2525

2626

2727
.PHONY: clean

‎go.mod‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,14 @@ require (
3333
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
3434
github.com/cloudflare/circl v1.6.0 // indirect
3535
github.com/davecgh/go-spew v1.1.1 // indirect
36+
github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 // indirect
3637
github.com/fatih/color v1.17.0 // indirect
38+
github.com/getkin/kin-openapi v0.127.0 // indirect
3739
github.com/go-logr/logr v1.4.2 // indirect
3840
github.com/go-logr/stdr v1.2.2 // indirect
41+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
42+
github.com/go-openapi/swag v0.23.0 // indirect
3943
github.com/go-resty/resty/v2 v2.16.5 // indirect
40-
github.com/go-test/deep v1.0.8 // indirect
4144
github.com/golang/protobuf v1.5.4 // indirect
4245
github.com/google/go-cmp v0.7.0 // indirect
4346
github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -56,18 +59,25 @@ require (
5659
github.com/hashicorp/terraform-registry-address v0.2.5 // indirect
5760
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
5861
github.com/hashicorp/yamux v0.1.1 // indirect
62+
github.com/invopop/yaml v0.3.1 // indirect
63+
github.com/josharian/intern v1.0.0 // indirect
64+
github.com/mailru/easyjson v0.7.7 // indirect
5965
github.com/mattn/go-colorable v0.1.13 // indirect
6066
github.com/mattn/go-isatty v0.0.20 // indirect
6167
github.com/mitchellh/copystructure v1.2.0 // indirect
6268
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
6369
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
6470
github.com/mitchellh/reflectwalk v1.0.2 // indirect
71+
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
6572
github.com/oklog/run v1.1.0 // indirect
73+
github.com/perimeterx/marshmallow v1.1.5 // indirect
6674
github.com/pmezard/go-difflib v1.0.0 // indirect
6775
github.com/sirupsen/logrus v1.9.3 // indirect
76+
github.com/speakeasy-api/openapi-overlay v0.9.0 // indirect
6877
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
6978
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
7079
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
80+
github.com/vmware-labs/yaml-jsonpath v0.3.2 // indirect
7181
github.com/zclconf/go-cty v1.16.2 // indirect
7282
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
7383
go.opentelemetry.io/otel v1.34.0 // indirect
@@ -84,9 +94,12 @@ require (
8494
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
8595
google.golang.org/grpc v1.72.1 // indirect
8696
google.golang.org/protobuf v1.36.6 // indirect
97+
gopkg.in/yaml.v2 v2.4.0 // indirect
8798
gopkg.in/yaml.v3 v3.0.1 // indirect
8899
)
89100

90101
replace github.com/disaster37/go-kibana-rest/v8 => ./libs/go-kibana-rest
91102

92103
tool go.uber.org/mock/mockgen
104+
105+
tool github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen

‎go.sum‎

Lines changed: 108 additions & 0 deletions
Large diffs are not rendered by default.

‎tools/connectors_gen.go‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎tools/go.mod‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ require (
88
github.com/client9/misspell v0.3.4
99
github.com/goreleaser/goreleaser/v2 v2.10.2
1010
github.com/hashicorp/terraform-plugin-docs v0.21.0
11-
github.com/oapi-codegen/oapi-codegen/v2 v2.4.1
1211
gopkg.in/yaml.v3 v3.0.1
1312
)
1413

@@ -135,7 +134,6 @@ require (
135134
github.com/docker/docker-credential-helpers v0.9.3 // indirect
136135
github.com/docker/go-connections v0.5.0 // indirect
137136
github.com/docker/go-units v0.5.0 // indirect
138-
github.com/dprotaso/go-yit v0.0.0-20240618133044-5a0af90af097 // indirect
139137
github.com/dustin/go-humanize v1.0.1 // indirect
140138
github.com/elliotchance/orderedmap/v2 v2.7.0 // indirect
141139
github.com/emirpasic/gods v1.18.1 // indirect
@@ -147,7 +145,6 @@ require (
147145
github.com/felixge/httpsnoop v1.0.4 // indirect
148146
github.com/fsnotify/fsnotify v1.9.0 // indirect
149147
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
150-
github.com/getkin/kin-openapi v0.131.0 // indirect
151148
github.com/github/smimesign v0.2.0 // indirect
152149
github.com/go-chi/chi v4.1.2+incompatible // indirect
153150
github.com/go-fed/httpsig v1.1.0 // indirect
@@ -245,7 +242,6 @@ require (
245242
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
246243
github.com/mitchellh/reflectwalk v1.0.2 // indirect
247244
github.com/moby/docker-image-spec v1.3.1 // indirect
248-
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
249245
github.com/mr-tron/base58 v1.2.0 // indirect
250246
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
251247
github.com/muesli/cancelreader v0.2.2 // indirect
@@ -259,8 +255,6 @@ require (
259255
github.com/multiformats/go-multibase v0.2.0 // indirect
260256
github.com/multiformats/go-multihash v0.2.3 // indirect
261257
github.com/multiformats/go-varint v0.0.7 // indirect
262-
github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 // indirect
263-
github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect
264258
github.com/oklog/ulid v1.3.1 // indirect
265259
github.com/onsi/gomega v1.36.2 // indirect
266260
github.com/opencontainers/go-digest v1.0.0 // indirect
@@ -269,7 +263,6 @@ require (
269263
github.com/pborman/uuid v1.2.1 // indirect
270264
github.com/pelletier/go-toml v1.9.5 // indirect
271265
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
272-
github.com/perimeterx/marshmallow v1.1.5 // indirect
273266
github.com/pjbgf/sha1cd v0.3.2 // indirect
274267
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
275268
github.com/pkg/errors v0.9.1 // indirect
@@ -296,7 +289,6 @@ require (
296289
github.com/slack-go/slack v0.17.0 // indirect
297290
github.com/sourcegraph/conc v0.3.0 // indirect
298291
github.com/spaolacci/murmur3 v1.1.0 // indirect
299-
github.com/speakeasy-api/openapi-overlay v0.9.0 // indirect
300292
github.com/spf13/afero v1.14.0 // indirect
301293
github.com/spf13/cast v1.7.1 // indirect
302294
github.com/spf13/cobra v1.9.1 // indirect
@@ -310,7 +302,6 @@ require (
310302
github.com/transparency-dev/merkle v0.0.2 // indirect
311303
github.com/ulikunitz/xz v0.5.12 // indirect
312304
github.com/vbatts/tar-split v0.12.1 // indirect
313-
github.com/vmware-labs/yaml-jsonpath v0.3.2 // indirect
314305
github.com/wagoodman/go-partybus v0.0.0-20230516145632-8ccac152c651 // indirect
315306
github.com/wagoodman/go-progress v0.0.0-20220614130704-4b1c25a33c7c // indirect
316307
github.com/whyrusleeping/cbor-gen v0.1.3-0.20240731173018-74d74643234c // indirect

0 commit comments

Comments
 (0)