From 5bd3c6e0e1d2a9eaf4a18a10af0f54962072a3a7 Mon Sep 17 00:00:00 2001 From: Simon Murray Date: Thu, 31 Oct 2024 09:44:53 +0000 Subject: [PATCH] Upgrade OpenAPI Codegen v1 is deprecated so we need to upgrade to v2 in order to avoid a bunch of warnings all over the show. --- Makefile | 10 ++-- pkg/openapi/client.go | 2 +- pkg/openapi/router.go | 48 +++++++++------ pkg/openapi/schema.go | 135 +++++++++++++++++++++--------------------- pkg/openapi/types.go | 2 +- 5 files changed, 104 insertions(+), 93 deletions(-) diff --git a/Makefile b/Makefile index 12ff4d6..6fd7601 100644 --- a/Makefile +++ b/Makefile @@ -69,7 +69,7 @@ CONTROLLER_TOOLS_VERSION=v0.16.3 # This should be kept in sync with the Kubenetes library versions defined in go.mod. CODEGEN_VERSION=v0.27.3 -OPENAPI_CODEGEN_VERSION=v1.16.2 +OPENAPI_CODEGEN_VERSION=v2.4.1 OPENAPI_CODEGEN_FLAGS=-package openapi -config pkg/openapi/config.yaml OPENAPI_SCHEMA=pkg/openapi/server.spec.yaml OPENAPI_FILES = \ @@ -160,19 +160,19 @@ $(GENDIR): $(APISRC) # Generate the server schema, types and router boilerplate. pkg/openapi/types.go: $(OPENAPI_SCHEMA) - @go install github.com/deepmap/oapi-codegen/cmd/oapi-codegen@$(OPENAPI_CODEGEN_VERSION) + @go install github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@$(OPENAPI_CODEGEN_VERSION) oapi-codegen -generate types $(OPENAPI_CODEGEN_FLAGS) -o $@ $< pkg/openapi/schema.go: $(OPENAPI_SCHEMA) - @go install github.com/deepmap/oapi-codegen/cmd/oapi-codegen@$(OPENAPI_CODEGEN_VERSION) + @go install github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@$(OPENAPI_CODEGEN_VERSION) oapi-codegen -generate spec $(OPENAPI_CODEGEN_FLAGS) -o $@ $< pkg/openapi/client.go: $(OPENAPI_SCHEMA) - @go install github.com/deepmap/oapi-codegen/cmd/oapi-codegen@$(OPENAPI_CODEGEN_VERSION) + @go install github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@$(OPENAPI_CODEGEN_VERSION) oapi-codegen -generate client $(OPENAPI_CODEGEN_FLAGS) -o $@ $< pkg/openapi/router.go: $(OPENAPI_SCHEMA) - @go install github.com/deepmap/oapi-codegen/cmd/oapi-codegen@$(OPENAPI_CODEGEN_VERSION) + @go install github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@$(OPENAPI_CODEGEN_VERSION) oapi-codegen -generate chi-server $(OPENAPI_CODEGEN_FLAGS) -o $@ $< # When checking out, the files timestamps are pretty much random, and make cause diff --git a/pkg/openapi/client.go b/pkg/openapi/client.go index 09ab662..108500f 100644 --- a/pkg/openapi/client.go +++ b/pkg/openapi/client.go @@ -1,6 +1,6 @@ // Package openapi provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen version v1.16.2 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.4.1 DO NOT EDIT. package openapi import ( diff --git a/pkg/openapi/router.go b/pkg/openapi/router.go index 6373b77..4880304 100644 --- a/pkg/openapi/router.go +++ b/pkg/openapi/router.go @@ -1,6 +1,6 @@ // Package openapi provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen version v1.16.2 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.4.1 DO NOT EDIT. package openapi import ( @@ -63,21 +63,24 @@ type MiddlewareFunc func(http.Handler) http.Handler // GetApiV1OrganizationsOrganizationIDClusters operation middleware func (siw *ServerInterfaceWrapper) GetApiV1OrganizationsOrganizationIDClusters(w http.ResponseWriter, r *http.Request) { - ctx := r.Context() var err error // ------------- Path parameter "organizationID" ------------- var organizationID OrganizationIDParameter - err = runtime.BindStyledParameterWithLocation("simple", false, "organizationID", runtime.ParamLocationPath, chi.URLParam(r, "organizationID"), &organizationID) + err = runtime.BindStyledParameterWithOptions("simple", "organizationID", chi.URLParam(r, "organizationID"), &organizationID, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "organizationID", Err: err}) return } + ctx := r.Context() + ctx = context.WithValue(ctx, Oauth2AuthenticationScopes, []string{}) + r = r.WithContext(ctx) + handler := http.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { siw.Handler.GetApiV1OrganizationsOrganizationIDClusters(w, r, organizationID) })) @@ -86,19 +89,18 @@ func (siw *ServerInterfaceWrapper) GetApiV1OrganizationsOrganizationIDClusters(w handler = middleware(handler) } - handler.ServeHTTP(w, r.WithContext(ctx)) + handler.ServeHTTP(w, r) } // PostApiV1OrganizationsOrganizationIDProjectsProjectIDClusters operation middleware func (siw *ServerInterfaceWrapper) PostApiV1OrganizationsOrganizationIDProjectsProjectIDClusters(w http.ResponseWriter, r *http.Request) { - ctx := r.Context() var err error // ------------- Path parameter "organizationID" ------------- var organizationID OrganizationIDParameter - err = runtime.BindStyledParameterWithLocation("simple", false, "organizationID", runtime.ParamLocationPath, chi.URLParam(r, "organizationID"), &organizationID) + err = runtime.BindStyledParameterWithOptions("simple", "organizationID", chi.URLParam(r, "organizationID"), &organizationID, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "organizationID", Err: err}) return @@ -107,14 +109,18 @@ func (siw *ServerInterfaceWrapper) PostApiV1OrganizationsOrganizationIDProjectsP // ------------- Path parameter "projectID" ------------- var projectID ProjectIDParameter - err = runtime.BindStyledParameterWithLocation("simple", false, "projectID", runtime.ParamLocationPath, chi.URLParam(r, "projectID"), &projectID) + err = runtime.BindStyledParameterWithOptions("simple", "projectID", chi.URLParam(r, "projectID"), &projectID, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "projectID", Err: err}) return } + ctx := r.Context() + ctx = context.WithValue(ctx, Oauth2AuthenticationScopes, []string{}) + r = r.WithContext(ctx) + handler := http.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { siw.Handler.PostApiV1OrganizationsOrganizationIDProjectsProjectIDClusters(w, r, organizationID, projectID) })) @@ -123,19 +129,18 @@ func (siw *ServerInterfaceWrapper) PostApiV1OrganizationsOrganizationIDProjectsP handler = middleware(handler) } - handler.ServeHTTP(w, r.WithContext(ctx)) + handler.ServeHTTP(w, r) } // DeleteApiV1OrganizationsOrganizationIDProjectsProjectIDClustersClusterID operation middleware func (siw *ServerInterfaceWrapper) DeleteApiV1OrganizationsOrganizationIDProjectsProjectIDClustersClusterID(w http.ResponseWriter, r *http.Request) { - ctx := r.Context() var err error // ------------- Path parameter "organizationID" ------------- var organizationID OrganizationIDParameter - err = runtime.BindStyledParameterWithLocation("simple", false, "organizationID", runtime.ParamLocationPath, chi.URLParam(r, "organizationID"), &organizationID) + err = runtime.BindStyledParameterWithOptions("simple", "organizationID", chi.URLParam(r, "organizationID"), &organizationID, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "organizationID", Err: err}) return @@ -144,7 +149,7 @@ func (siw *ServerInterfaceWrapper) DeleteApiV1OrganizationsOrganizationIDProject // ------------- Path parameter "projectID" ------------- var projectID ProjectIDParameter - err = runtime.BindStyledParameterWithLocation("simple", false, "projectID", runtime.ParamLocationPath, chi.URLParam(r, "projectID"), &projectID) + err = runtime.BindStyledParameterWithOptions("simple", "projectID", chi.URLParam(r, "projectID"), &projectID, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "projectID", Err: err}) return @@ -153,14 +158,18 @@ func (siw *ServerInterfaceWrapper) DeleteApiV1OrganizationsOrganizationIDProject // ------------- Path parameter "clusterID" ------------- var clusterID ClusterIDParameter - err = runtime.BindStyledParameterWithLocation("simple", false, "clusterID", runtime.ParamLocationPath, chi.URLParam(r, "clusterID"), &clusterID) + err = runtime.BindStyledParameterWithOptions("simple", "clusterID", chi.URLParam(r, "clusterID"), &clusterID, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "clusterID", Err: err}) return } + ctx := r.Context() + ctx = context.WithValue(ctx, Oauth2AuthenticationScopes, []string{}) + r = r.WithContext(ctx) + handler := http.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { siw.Handler.DeleteApiV1OrganizationsOrganizationIDProjectsProjectIDClustersClusterID(w, r, organizationID, projectID, clusterID) })) @@ -169,19 +178,18 @@ func (siw *ServerInterfaceWrapper) DeleteApiV1OrganizationsOrganizationIDProject handler = middleware(handler) } - handler.ServeHTTP(w, r.WithContext(ctx)) + handler.ServeHTTP(w, r) } // PutApiV1OrganizationsOrganizationIDProjectsProjectIDClustersClusterID operation middleware func (siw *ServerInterfaceWrapper) PutApiV1OrganizationsOrganizationIDProjectsProjectIDClustersClusterID(w http.ResponseWriter, r *http.Request) { - ctx := r.Context() var err error // ------------- Path parameter "organizationID" ------------- var organizationID OrganizationIDParameter - err = runtime.BindStyledParameterWithLocation("simple", false, "organizationID", runtime.ParamLocationPath, chi.URLParam(r, "organizationID"), &organizationID) + err = runtime.BindStyledParameterWithOptions("simple", "organizationID", chi.URLParam(r, "organizationID"), &organizationID, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "organizationID", Err: err}) return @@ -190,7 +198,7 @@ func (siw *ServerInterfaceWrapper) PutApiV1OrganizationsOrganizationIDProjectsPr // ------------- Path parameter "projectID" ------------- var projectID ProjectIDParameter - err = runtime.BindStyledParameterWithLocation("simple", false, "projectID", runtime.ParamLocationPath, chi.URLParam(r, "projectID"), &projectID) + err = runtime.BindStyledParameterWithOptions("simple", "projectID", chi.URLParam(r, "projectID"), &projectID, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "projectID", Err: err}) return @@ -199,14 +207,18 @@ func (siw *ServerInterfaceWrapper) PutApiV1OrganizationsOrganizationIDProjectsPr // ------------- Path parameter "clusterID" ------------- var clusterID ClusterIDParameter - err = runtime.BindStyledParameterWithLocation("simple", false, "clusterID", runtime.ParamLocationPath, chi.URLParam(r, "clusterID"), &clusterID) + err = runtime.BindStyledParameterWithOptions("simple", "clusterID", chi.URLParam(r, "clusterID"), &clusterID, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true}) if err != nil { siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "clusterID", Err: err}) return } + ctx := r.Context() + ctx = context.WithValue(ctx, Oauth2AuthenticationScopes, []string{}) + r = r.WithContext(ctx) + handler := http.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { siw.Handler.PutApiV1OrganizationsOrganizationIDProjectsProjectIDClustersClusterID(w, r, organizationID, projectID, clusterID) })) @@ -215,7 +227,7 @@ func (siw *ServerInterfaceWrapper) PutApiV1OrganizationsOrganizationIDProjectsPr handler = middleware(handler) } - handler.ServeHTTP(w, r.WithContext(ctx)) + handler.ServeHTTP(w, r) } type UnescapedCookieParamError struct { diff --git a/pkg/openapi/schema.go b/pkg/openapi/schema.go index 88f949e..6de3e4d 100644 --- a/pkg/openapi/schema.go +++ b/pkg/openapi/schema.go @@ -1,6 +1,6 @@ // Package openapi provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen version v1.16.2 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.4.1 DO NOT EDIT. package openapi import ( @@ -19,70 +19,71 @@ import ( // Base64 encoded, gzipped, json marshaled Swagger object var swaggerSpec = []string{ - "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", } // GetSwagger returns the content of the embedded swagger specification file @@ -122,9 +123,7 @@ func PathToRawSpec(pathToFile string) map[string]func() ([]byte, error) { res[pathToFile] = rawSpec } - pathPrefix := path.Dir(pathToFile) - - for rawPath, rawFunc := range externalRef0.PathToRawSpec(path.Join(pathPrefix, "https://raw.githubusercontent.com/unikorn-cloud/core/main/pkg/openapi/common.spec.yaml")) { + for rawPath, rawFunc := range externalRef0.PathToRawSpec(path.Join(path.Dir(pathToFile), "https://raw.githubusercontent.com/unikorn-cloud/core/main/pkg/openapi/common.spec.yaml")) { if _, ok := res[rawPath]; ok { // it is not possible to compare functions in golang, so always overwrite the old value } diff --git a/pkg/openapi/types.go b/pkg/openapi/types.go index b7ed344..cc35422 100644 --- a/pkg/openapi/types.go +++ b/pkg/openapi/types.go @@ -1,6 +1,6 @@ // Package openapi provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen version v1.16.2 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.4.1 DO NOT EDIT. package openapi import (