From 9d0e727e4d43a5194df426d39ba877b3d5e4db34 Mon Sep 17 00:00:00 2001 From: Caleb Doxsey Date: Mon, 5 Feb 2024 11:44:21 -0700 Subject: [PATCH] core/zero: upgrade oapi-codegen (#4953) --- pkg/zero/cluster/client.gen.go | 2 +- pkg/zero/cluster/generate.go | 6 +++--- pkg/zero/cluster/models.gen.go | 2 +- pkg/zero/cluster/server.gen.go | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkg/zero/cluster/client.gen.go b/pkg/zero/cluster/client.gen.go index 92deede80..19bc3928d 100644 --- a/pkg/zero/cluster/client.gen.go +++ b/pkg/zero/cluster/client.gen.go @@ -1,6 +1,6 @@ // Package cluster provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.1.0 DO NOT EDIT. package cluster import ( diff --git a/pkg/zero/cluster/generate.go b/pkg/zero/cluster/generate.go index 1db04cbc5..123fe7b90 100644 --- a/pkg/zero/cluster/generate.go +++ b/pkg/zero/cluster/generate.go @@ -1,5 +1,5 @@ package cluster -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen@v2.0.0 --config=models.yaml openapi.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen@v2.0.0 --config=server.yaml openapi.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen@v2.0.0 --config=client.yaml openapi.yaml +//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen@v2.1.0 --config=models.yaml openapi.yaml +//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen@v2.1.0 --config=server.yaml openapi.yaml +//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen@v2.1.0 --config=client.yaml openapi.yaml diff --git a/pkg/zero/cluster/models.gen.go b/pkg/zero/cluster/models.gen.go index 35a23be1a..fc40f1ec5 100644 --- a/pkg/zero/cluster/models.gen.go +++ b/pkg/zero/cluster/models.gen.go @@ -1,6 +1,6 @@ // Package cluster provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.1.0 DO NOT EDIT. package cluster const ( diff --git a/pkg/zero/cluster/server.gen.go b/pkg/zero/cluster/server.gen.go index 42f254ad7..e0e7734d5 100644 --- a/pkg/zero/cluster/server.gen.go +++ b/pkg/zero/cluster/server.gen.go @@ -1,6 +1,6 @@ // Package cluster provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.1.0 DO NOT EDIT. package cluster import ( @@ -114,7 +114,7 @@ func (siw *ServerInterfaceWrapper) DownloadClusterResourceBundle(w http.Response // ------------- Path parameter "bundleId" ------------- var bundleId BundleId - err = runtime.BindStyledParameterWithLocation("simple", false, "bundleId", runtime.ParamLocationPath, chi.URLParam(r, "bundleId"), &bundleId) + err = runtime.BindStyledParameterWithOptions("simple", "bundleId", chi.URLParam(r, "bundleId"), &bundleId, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "bundleId", Err: err}) return @@ -142,7 +142,7 @@ func (siw *ServerInterfaceWrapper) ReportClusterResourceBundleStatus(w http.Resp // ------------- Path parameter "bundleId" ------------- var bundleId BundleId - err = runtime.BindStyledParameterWithLocation("simple", false, "bundleId", runtime.ParamLocationPath, chi.URLParam(r, "bundleId"), &bundleId) + err = runtime.BindStyledParameterWithOptions("simple", "bundleId", chi.URLParam(r, "bundleId"), &bundleId, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "bundleId", Err: err}) return @@ -509,8 +509,8 @@ type StrictServerInterface interface { ExchangeClusterIdentityToken(ctx context.Context, request ExchangeClusterIdentityTokenRequestObject) (ExchangeClusterIdentityTokenResponseObject, error) } -type StrictHandlerFunc = strictnethttp.StrictHttpHandlerFunc -type StrictMiddlewareFunc = strictnethttp.StrictHttpMiddlewareFunc +type StrictHandlerFunc = strictnethttp.StrictHTTPHandlerFunc +type StrictMiddlewareFunc = strictnethttp.StrictHTTPMiddlewareFunc type StrictHTTPServerOptions struct { RequestErrorHandlerFunc func(w http.ResponseWriter, r *http.Request, err error)