Skip to content

Commit 069094c

Browse files
michel-latermanmichel-laterman
authored
Update oapi-codegen to v1.15.0, regenerate old api client (#3024)
Update oapi-codegen to v1.15.0 and regenerate the 2022_06_01 client from commit 1d28f4c with the new version in order to get rid of unneeded dependencies.
1 parent ef70e49 commit 069094c

File tree

13 files changed

+3038
-3404
lines changed

13 files changed

+3038
-3404
lines changed

‎.golangci.yml

+2
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ linters-settings:
142142
blocked:
143143
# List of blocked modules.
144144
modules:
145+
- github.com/bytedance/sonic:
146+
reason: "Federal restriction on bytedance"
145147
- github.com/elastic/beats/v7:
146148
reason: "There must be no Beats dependency, use elastic-agent-libs instead."
147149
- github.com/elastic/beats/elastic-agent:

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ generate: ## - Generate schema models
9696
@printf "${CMD_COLOR_ON} Installing module for go generate\n${CMD_COLOR_OFF}"
9797
env GOBIN=${GOBIN} go install github.com/elastic/go-json-schema-generate/cmd/schema-generate@ec19b88f6b5ef7825a928df8274a99337b855d1f
9898
@printf "${CMD_COLOR_ON} Installing module for oapi-codegen\n${CMD_COLOR_OFF}"
99-
env GOBIN=${GOBIN} go install github.com/deepmap/oapi-codegen/cmd/oapi-codegen@v1.13.4
99+
env GOBIN=${GOBIN} go install github.com/deepmap/oapi-codegen/cmd/oapi-codegen@v1.15.0
100100
@printf "${CMD_COLOR_ON} Running go generate\n${CMD_COLOR_OFF}"
101101
env PATH="${GOBIN}:${PATH}" go generate ./...
102102

‎NOTICE.txt

+2,552-2,909
Large diffs are not rendered by default.

‎dev-tools/notice/overrides.json

+1
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@
1818
{"name": "kernel.org/pub/linux/libs/security/libcap/psx", "licenceType": "BSD-3-Clause", "note": "dual licensed as GPL-v2 and BSD"}
1919
{"name": "github.com/awslabs/kinesis-aggregation/go", "licenceType": "Apache-2.0", "url": "https://github.com/awslabs/kinesis-aggregation/blob/master/LICENSE.txt"}
2020
{"name": "github.com/pascaldekloe/goe", "licenceType": "CC0", "url": "https://github.com/pascaldekloe/goe/blob/v0.1.0/LICENSE" }
21+
{"name": "github.com/iris-contrib/schema", "licenceType": "BSD-3-Clause"}

‎go.mod

+15-37
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@ go 1.20
44

55
require (
66
github.com/Pallinder/go-randomdata v1.2.0
7-
github.com/deepmap/oapi-codegen v1.13.0
87
github.com/dgraph-io/ristretto v0.1.1
98
github.com/elastic/elastic-agent-client/v7 v7.3.0
109
github.com/elastic/elastic-agent-libs v0.3.13
1110
github.com/elastic/elastic-agent-system-metrics v0.6.1
1211
github.com/elastic/go-elasticsearch/v8 v8.7.0
1312
github.com/elastic/go-ucfg v0.8.6
1413
github.com/fxamacker/cbor/v2 v2.4.0
15-
github.com/go-chi/chi/v5 v5.0.8
14+
github.com/go-chi/chi/v5 v5.0.10
1615
github.com/gofrs/uuid v4.4.0+incompatible
1716
github.com/google/go-cmp v0.5.9
1817
github.com/hashicorp/go-cleanhttp v0.5.2
1918
github.com/hashicorp/go-version v1.6.0
2019
github.com/hashicorp/golang-lru/v2 v2.0.2
2120
github.com/mailru/easyjson v0.7.7
2221
github.com/miolini/datacounter v1.0.3
22+
github.com/oapi-codegen/runtime v1.0.0
2323
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58
2424
github.com/prometheus/client_golang v1.15.0
2525
github.com/rs/xid v1.4.0
@@ -34,10 +34,10 @@ require (
3434
go.elastic.co/apm/v2 v2.4.4
3535
go.elastic.co/ecszerolog v0.1.0
3636
go.uber.org/zap v1.24.0
37-
golang.org/x/sync v0.2.0
37+
golang.org/x/sync v0.3.0
3838
golang.org/x/time v0.3.0
3939
google.golang.org/grpc v1.54.0
40-
google.golang.org/protobuf v1.30.0
40+
google.golang.org/protobuf v1.31.0
4141
gopkg.in/yaml.v3 v3.0.1
4242
)
4343

@@ -46,45 +46,28 @@ require (
4646
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
4747
github.com/armon/go-radix v1.0.0 // indirect
4848
github.com/beorn7/perks v1.0.1 // indirect
49-
github.com/bytedance/sonic v1.9.1 // indirect
5049
github.com/cespare/xxhash/v2 v2.2.0 // indirect
51-
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
5250
github.com/davecgh/go-spew v1.1.1 // indirect
5351
github.com/dustin/go-humanize v1.0.1 // indirect
5452
github.com/elastic/elastic-transport-go/v8 v8.2.0 // indirect
5553
github.com/elastic/go-structform v0.0.10 // indirect
5654
github.com/elastic/go-sysinfo v1.10.1 // indirect
5755
github.com/elastic/go-windows v1.0.1 // indirect
5856
github.com/elastic/gosigar v0.14.2 // indirect
59-
github.com/fatih/color v1.13.0 // indirect
60-
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
61-
github.com/gin-contrib/sse v0.1.0 // indirect
62-
github.com/gin-gonic/gin v1.9.1 // indirect
57+
github.com/fatih/color v1.15.0 // indirect
6358
github.com/go-ole/go-ole v1.2.6 // indirect
64-
github.com/go-playground/locales v0.14.1 // indirect
65-
github.com/go-playground/universal-translator v0.18.1 // indirect
66-
github.com/go-playground/validator/v10 v10.14.0 // indirect
67-
github.com/goccy/go-json v0.10.2 // indirect
6859
github.com/golang/glog v1.0.0 // indirect
6960
github.com/golang/protobuf v1.5.3 // indirect
70-
github.com/google/uuid v1.3.0 // indirect
61+
github.com/google/uuid v1.3.1 // indirect
7162
github.com/hashicorp/errwrap v1.1.0 // indirect
7263
github.com/hashicorp/go-multierror v1.1.1 // indirect
7364
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7465
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
7566
github.com/josharian/intern v1.0.0 // indirect
76-
github.com/json-iterator/go v1.1.12 // indirect
77-
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
78-
github.com/labstack/echo/v4 v4.10.2 // indirect
79-
github.com/labstack/gommon v0.4.0 // indirect
80-
github.com/leodido/go-urn v1.2.4 // indirect
8167
github.com/magefile/mage v1.14.0 // indirect
8268
github.com/mattn/go-colorable v0.1.13 // indirect
8369
github.com/mattn/go-isatty v0.0.19 // indirect
8470
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
85-
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
86-
github.com/modern-go/reflect2 v1.0.2 // indirect
87-
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
8871
github.com/pkg/errors v0.9.1 // indirect
8972
github.com/pmezard/go-difflib v1.0.0 // indirect
9073
github.com/prometheus/client_model v0.3.0 // indirect
@@ -94,26 +77,21 @@ require (
9477
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
9578
github.com/spf13/pflag v1.0.5 // indirect
9679
github.com/stretchr/objx v0.5.0 // indirect
97-
github.com/tklauser/go-sysconf v0.3.11 // indirect
98-
github.com/tklauser/numcpus v0.6.0 // indirect
99-
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
100-
github.com/ugorji/go/codec v1.2.11 // indirect
101-
github.com/valyala/bytebufferpool v1.0.0 // indirect
102-
github.com/valyala/fasttemplate v1.2.2 // indirect
80+
github.com/tklauser/go-sysconf v0.3.12 // indirect
81+
github.com/tklauser/numcpus v0.6.1 // indirect
10382
github.com/x448/float16 v0.8.4 // indirect
10483
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
105-
github.com/yusufpapurcu/wmi v1.2.2 // indirect
84+
github.com/yusufpapurcu/wmi v1.2.3 // indirect
10685
go.elastic.co/ecszap v1.0.1 // indirect
10786
go.elastic.co/fastjson v1.1.0 // indirect
10887
go.uber.org/atomic v1.10.0 // indirect
10988
go.uber.org/multierr v1.8.0 // indirect
110-
golang.org/x/arch v0.3.0 // indirect
111-
golang.org/x/crypto v0.9.0 // indirect
112-
golang.org/x/mod v0.10.0 // indirect
113-
golang.org/x/net v0.10.0 // indirect
114-
golang.org/x/sys v0.9.0 // indirect
115-
golang.org/x/text v0.9.0 // indirect
116-
golang.org/x/tools v0.9.2 // indirect
89+
golang.org/x/crypto v0.13.0 // indirect
90+
golang.org/x/mod v0.12.0 // indirect
91+
golang.org/x/net v0.15.0 // indirect
92+
golang.org/x/sys v0.12.0 // indirect
93+
golang.org/x/text v0.13.0 // indirect
94+
golang.org/x/tools v0.12.0 // indirect
11795
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
11896
gopkg.in/yaml.v2 v2.4.0 // indirect
11997
howett.net/plist v1.0.0 // indirect

0 commit comments

Comments
 (0)