From 4bdba0ffa295a222cebc86df98ac02ce3a6c451c Mon Sep 17 00:00:00 2001 From: "elastic-renovate-prod[bot]" <174716857+elastic-renovate-prod[bot]@users.noreply.github.com> Date: Sun, 1 Sep 2024 09:44:49 +0000 Subject: [PATCH 1/2] fix(deps): update module github.com/deepmap/oapi-codegen/v2 to v2.3.0 --- go.mod | 2 +- tools/go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 8169e9de7..5d4e11e66 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22 toolchain go1.22.2 require ( - github.com/deepmap/oapi-codegen/v2 v2.2.0 + github.com/deepmap/oapi-codegen/v2 v2.3.0 github.com/disaster37/go-kibana-rest/v8 v8.5.0 github.com/elastic/go-elasticsearch/v7 v7.17.10 github.com/google/uuid v1.6.0 diff --git a/tools/go.mod b/tools/go.mod index cdada7b95..d137d0cb4 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -6,7 +6,7 @@ toolchain go1.22.5 require ( github.com/client9/misspell v0.3.4 - github.com/deepmap/oapi-codegen/v2 v2.1.0 + github.com/deepmap/oapi-codegen/v2 v2.3.0 github.com/golangci/golangci-lint v1.60.3 github.com/goreleaser/goreleaser v1.26.2 github.com/hashicorp/terraform-plugin-docs v0.18.0 From df2fc1a35f92863692c1584cae56d66d7f2fd2c0 Mon Sep 17 00:00:00 2001 From: Toby Brain Date: Sun, 1 Sep 2024 21:43:35 +1000 Subject: [PATCH 2/2] deepmap -> oapi-codegen --- Makefile | 2 +- go.mod | 2 +- go.sum | 4 ++-- internal/clients/api_client.go | 2 +- tools/connectors_gen.go | 2 +- tools/fleet_gen.go | 2 +- tools/go.mod | 4 ++-- tools/go.sum | 10 ++++------ tools/tools.go | 2 +- 9 files changed, 14 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 8bc3eeb3b..5c2ac9033 100644 --- a/Makefile +++ b/Makefile @@ -215,7 +215,7 @@ tools: $(GOBIN) ## Install useful tools for linting, docs generation and develop @ cd tools && go install github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs @ cd tools && go install github.com/golangci/golangci-lint/cmd/golangci-lint @ cd tools && go install github.com/goreleaser/goreleaser - @ cd tools && go install github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen + @ cd tools && go install github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen @ cd tools && go install go.uber.org/mock/mockgen .PHONY: misspell diff --git a/go.mod b/go.mod index 5d4e11e66..6b096b3dc 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,6 @@ go 1.22 toolchain go1.22.2 require ( - github.com/deepmap/oapi-codegen/v2 v2.3.0 github.com/disaster37/go-kibana-rest/v8 v8.5.0 github.com/elastic/go-elasticsearch/v7 v7.17.10 github.com/google/uuid v1.6.0 @@ -19,6 +18,7 @@ require ( github.com/hashicorp/terraform-plugin-mux v0.16.0 github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0 github.com/mitchellh/mapstructure v1.5.0 + github.com/oapi-codegen/oapi-codegen/v2 v2.3.0 github.com/oapi-codegen/runtime v1.1.1 github.com/stretchr/testify v1.9.0 go.uber.org/mock v0.4.0 diff --git a/go.sum b/go.sum index 3e97cd920..98824bd21 100644 --- a/go.sum +++ b/go.sum @@ -23,8 +23,6 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/deepmap/oapi-codegen/v2 v2.2.0 h1:FW4f7C0Xb6EaezBSB3GYw2QGwHD5ChDflG+3xSZBdvY= -github.com/deepmap/oapi-codegen/v2 v2.2.0/go.mod h1:L4zUv7ULYDtYSb/aYk/xO3OYcQU6BoU/0viULkbi2DE= github.com/elastic/go-elasticsearch/v7 v7.17.10 h1:TCQ8i4PmIJuBunvBS6bwT2ybzVFxxUhhltAs3Gyu1yo= github.com/elastic/go-elasticsearch/v7 v7.17.10/go.mod h1:OJ4wdbtDNk5g503kvlHLyErCgQwwzmDtaFC4XyOxXA4= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= @@ -143,6 +141,8 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/oapi-codegen/oapi-codegen/v2 v2.3.0 h1:rICjNsHbPP1LttefanBPnwsSwl09SqhCO7Ee623qR84= +github.com/oapi-codegen/oapi-codegen/v2 v2.3.0/go.mod h1:4k+cJeSq5ntkwlcpQSxLxICCxQzCL772o30PxdibRt4= github.com/oapi-codegen/runtime v1.1.1 h1:EXLHh0DXIJnWhdRPN2w4MXAzFyE4CskzhNLUmtpMYro= github.com/oapi-codegen/runtime v1.1.1/go.mod h1:SK9X900oXmPWilYR5/WKPzt3Kqxn/uS/+lbpREv+eCg= github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= diff --git a/internal/clients/api_client.go b/internal/clients/api_client.go index f43eaec22..9f929703a 100644 --- a/internal/clients/api_client.go +++ b/internal/clients/api_client.go @@ -8,7 +8,6 @@ import ( "net/http" "strings" - "github.com/deepmap/oapi-codegen/v2/pkg/securityprovider" "github.com/disaster37/go-kibana-rest/v8" "github.com/elastic/go-elasticsearch/v7" "github.com/elastic/terraform-provider-elasticstack/generated/alerting" @@ -25,6 +24,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/logging" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/securityprovider" ) type CompositeId struct { diff --git a/tools/connectors_gen.go b/tools/connectors_gen.go index a16a4045a..082170dcf 100644 --- a/tools/connectors_gen.go +++ b/tools/connectors_gen.go @@ -1,4 +1,4 @@ -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -package connectors -o ../generated/connectors/connectors.gen.go -generate "types,client" ../generated/connectors/bundled.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -package connectors -o ../generated/connectors/connectors.gen.go -generate "types,client" ../generated/connectors/bundled.yaml //go:generate go run go.uber.org/mock/mockgen -destination=../generated/alerting/api_alerting_mocks.go -package=alerting -source ../generated/alerting/api_alerting.go AlertingAPI //go:generate go run go.uber.org/mock/mockgen -destination=../internal/clients/kibana/alerting_mocks.go -package=kibana -source ../internal/clients/kibana/alerting.go ApiClient diff --git a/tools/fleet_gen.go b/tools/fleet_gen.go index 2e0e395ed..d01d7493c 100644 --- a/tools/fleet_gen.go +++ b/tools/fleet_gen.go @@ -1,4 +1,4 @@ package tools //go:generate go run ../generated/fleet/getschema.go -v v8.10.0 -o ../generated/fleet/fleet-filtered.json -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -package=fleet -generate=types,client -o ../generated/fleet/fleet.gen.go ../generated/fleet/fleet-filtered.json +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -package=fleet -generate=types,client -o ../generated/fleet/fleet.gen.go ../generated/fleet/fleet-filtered.json diff --git a/tools/go.mod b/tools/go.mod index d137d0cb4..0d4b92d03 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -6,10 +6,10 @@ toolchain go1.22.5 require ( github.com/client9/misspell v0.3.4 - github.com/deepmap/oapi-codegen/v2 v2.3.0 github.com/golangci/golangci-lint v1.60.3 github.com/goreleaser/goreleaser v1.26.2 github.com/hashicorp/terraform-plugin-docs v0.18.0 + github.com/oapi-codegen/oapi-codegen/v2 v2.3.0 go.uber.org/mock v0.4.0 ) @@ -167,7 +167,7 @@ require ( github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/fzipp/gocyclo v0.6.0 // indirect github.com/gabriel-vasile/mimetype v1.4.2 // indirect - github.com/getkin/kin-openapi v0.122.0 // indirect + github.com/getkin/kin-openapi v0.124.0 // indirect github.com/ghostiam/protogetter v0.3.6 // indirect github.com/github/smimesign v0.2.0 // indirect github.com/go-critic/go-critic v0.11.4 // indirect diff --git a/tools/go.sum b/tools/go.sum index e67a9ef3a..b1152cce8 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -311,8 +311,6 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davidmz/go-pageant v1.0.2 h1:bPblRCh5jGU+Uptpz6LgMZGD5hJoOt7otgT454WvHn0= github.com/davidmz/go-pageant v1.0.2/go.mod h1:P2EDDnMqIwG5Rrp05dTRITj9z2zpGcD9efWSkTNKLIE= -github.com/deepmap/oapi-codegen/v2 v2.1.0 h1:I/NMVhJCtuvL9x+S2QzZKpSjGi33oDZwPRdemvOZWyQ= -github.com/deepmap/oapi-codegen/v2 v2.1.0/go.mod h1:R1wL226vc5VmCNJUvMyYr3hJMm5reyv25j952zAVXZ8= github.com/denis-tingaikin/go-header v0.5.0 h1:SRdnP5ZKvcO9KKRP1KJrhFR3RrlGuD+42t4429eC9k8= github.com/denis-tingaikin/go-header v0.5.0/go.mod h1:mMenU5bWrok6Wl2UsZjy+1okegmwQ3UgWl4V1D8gjlY= github.com/dghubble/go-twitter v0.0.0-20211115160449-93a8679adecb h1:7ENzkH+O3juL+yj2undESLTaAeRllHwCs/b8z6aWSfc= @@ -375,8 +373,8 @@ github.com/fzipp/gocyclo v0.6.0 h1:lsblElZG7d3ALtGMx9fmxeTKZaLLpU8mET09yN4BBLo= github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA= github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= -github.com/getkin/kin-openapi v0.122.0 h1:WB9Jbl0Hp/T79/JF9xlSW5Kl9uYdk/AWD0yAd9HOM10= -github.com/getkin/kin-openapi v0.122.0/go.mod h1:PCWw/lfBrJY4HcdqE3jj+QFkaFK8ABoqo7PvqVhXXqw= +github.com/getkin/kin-openapi v0.124.0 h1:VSFNMB9C9rTKBnQ/fpyDU8ytMTr4dWI9QovSKj9kz/M= +github.com/getkin/kin-openapi v0.124.0/go.mod h1:wb1aSZA/iWmorQP9KTAS/phLj/t17B5jT7+fS8ed9NM= github.com/ghostiam/protogetter v0.3.6 h1:R7qEWaSgFCsy20yYHNIJsU9ZOb8TziSRRxuAOTVKeOk= github.com/ghostiam/protogetter v0.3.6/go.mod h1:7lpeDnEJ1ZjL/YtyoN99ljO4z0pd3H0d18/t2dPBxHw= github.com/github/smimesign v0.2.0 h1:Hho4YcX5N1I9XNqhq0fNx0Sts8MhLonHd+HRXVGNjvk= @@ -829,6 +827,8 @@ github.com/nishanths/predeclared v0.2.2 h1:V2EPdZPliZymNAn79T8RkNApBjMmVKh5XRpLm github.com/nishanths/predeclared v0.2.2/go.mod h1:RROzoN6TnGQupbC+lqggsOlcgysk3LMK/HI84Mp280c= github.com/nunnatsa/ginkgolinter v0.16.2 h1:8iLqHIZvN4fTLDC0Ke9tbSZVcyVHoBs0HIbnVSxfHJk= github.com/nunnatsa/ginkgolinter v0.16.2/go.mod h1:4tWRinDN1FeJgU+iJANW/kz7xKN5nYRAOfJDQUS9dOQ= +github.com/oapi-codegen/oapi-codegen/v2 v2.3.0 h1:rICjNsHbPP1LttefanBPnwsSwl09SqhCO7Ee623qR84= +github.com/oapi-codegen/oapi-codegen/v2 v2.3.0/go.mod h1:4k+cJeSq5ntkwlcpQSxLxICCxQzCL772o30PxdibRt4= github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= @@ -1171,8 +1171,6 @@ golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTk golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug= -golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= diff --git a/tools/tools.go b/tools/tools.go index 8f4739a37..43d2b7e49 100644 --- a/tools/tools.go +++ b/tools/tools.go @@ -5,9 +5,9 @@ package tools import ( _ "github.com/client9/misspell/cmd/misspell" - _ "github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen" _ "github.com/golangci/golangci-lint/cmd/golangci-lint" _ "github.com/goreleaser/goreleaser" _ "github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs" + _ "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen" _ "go.uber.org/mock/mockgen" )