Merge pull request #215 from projectsyn/update-dependencies

Update OpenAPI codegen and dependencies

go.mod

@@ -6,12 +6,14 @@ toolchain go1.22.3
 
 require (
 	github.com/AlekSi/pointer v1.2.0
-	github.com/cosmtrek/air v1.40.4
-	github.com/deepmap/oapi-codegen v1.9.0
-	github.com/getkin/kin-openapi v0.98.0
-	github.com/hashicorp/golang-lru v0.5.4
+	github.com/cosmtrek/air v1.52.0
+	github.com/deepmap/oapi-codegen v1.16.2
+	github.com/deepmap/oapi-codegen/v2 v2.1.0
+	github.com/getkin/kin-openapi v0.123.0
+	github.com/hashicorp/golang-lru v1.0.2
 	github.com/labstack/echo/v4 v4.12.0
-	github.com/projectsyn/lieutenant-operator v1.5.0
+	github.com/oapi-codegen/runtime v1.1.1
+	github.com/projectsyn/lieutenant-operator v1.5.3
 	github.com/stretchr/testify v1.9.0
 	github.com/taion809/haikunator v0.0.0-20150324135039-4e414e676fd1
 	k8s.io/api v0.30.1
@@ -20,43 +22,59 @@ require (
 )
 
 require (
-	github.com/creack/pty v1.1.11 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	dario.cat/mergo v1.0.0 // indirect
+	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
+	github.com/bep/godartsass v1.2.0 // indirect
+	github.com/bep/godartsass/v2 v2.0.0 // indirect
+	github.com/bep/golibsass v1.1.1 // indirect
+	github.com/cli/safeexec v1.0.1 // indirect
+	github.com/creack/pty v1.1.21 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/emicklei/go-restful/v3 v3.12.0 // indirect
-	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
+	github.com/evanphx/json-patch v5.9.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
-	github.com/fatih/color v1.13.0 // indirect
+	github.com/fatih/color v1.17.0 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/jsonreference v0.21.0 // indirect
 	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/gohugoio/hugo v0.126.1 // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/gorilla/mux v1.8.0 // indirect
+	github.com/gorilla/mux v1.8.1 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
-	github.com/invopop/yaml v0.1.0 // indirect
+	github.com/invopop/yaml v0.3.1 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/labstack/gommon v0.4.2 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mitchellh/hashstructure v1.1.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
+	github.com/perimeterx/marshmallow v1.1.5 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/spf13/afero v1.11.0 // indirect
+	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/tdewolff/minify/v2 v2.20.31 // indirect
+	github.com/tdewolff/parse/v2 v2.7.14 // indirect
+	github.com/ugorji/go/codec v1.2.12 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasttemplate v1.2.2 // indirect
 	golang.org/x/crypto v0.23.0 // indirect
-	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
 	golang.org/x/mod v0.17.0 // indirect
 	golang.org/x/net v0.25.0 // indirect
 	golang.org/x/oauth2 v0.20.0 // indirect

main.go

@@ -1,5 +1,4 @@
-//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen -package=api -o=pkg/api/openapi.go -generate=types,server,spec openapi.yaml
-//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen -package=api -o=pkg/api/client.go -generate=client openapi.yaml
+//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config oapi-codegen.conf openapi.yaml
 
 package main
 

oapi-codegen.conf

@@ -0,0 +1,12 @@
+package: api
+generate:
+  echo-server: true
+  client: true
+  models: true
+  embedded-spec: true
+compatibility:
+  old-merge-schemas: true
+  old-aliasing: true
+  old-enum-conflicts: true
+  disable-required-readonly-as-pointer: true
+output: pkg/api/openapi.go

openapi.yaml

@@ -33,7 +33,6 @@ components:
       description: >
         A unique object identifier string. Automatically generated by the API on creation (in the form
         "<letter>-<adjective>-<noun>-<digits>" where all letters are lowercase, max 63 characters in total).
-      readOnly: true
     OIDCConfig:
       type: object
       required:
@@ -79,8 +78,6 @@ components:
           example: v1.2.3
     TenantId:
       type: object
-      required:
-        - id
       properties:
         id:
           $ref: '#/components/schemas/Id'
@@ -139,8 +136,6 @@ components:
         - $ref: '#/components/schemas/ClusterProperties'
     ClusterId:
       type: object
-      required:
-        - id
       properties:
         id:
           $ref: '#/components/schemas/Id'