From afc21e40c0ce74593bb9f8344ea68e3e72952dc0 Mon Sep 17 00:00:00 2001 From: Gerard Snaauw Date: Mon, 13 Nov 2023 12:36:35 +0100 Subject: [PATCH] update oapi-codegen --- api/ssi_types.go | 2 +- auth/api/auth/v1/client/generated.go | 2 +- auth/api/auth/v1/generated.go | 2 +- auth/api/iam/generated.go | 2 +- auth/services/selfsigned/web/generated.go | 2 +- codegen/README.md | 10 ---------- crypto/api/v1/generated.go | 2 +- crypto/storage/external/generated.go | 2 +- didman/api/v1/generated.go | 2 +- makefile | 2 +- network/api/v1/generated.go | 2 +- vcr/api/openid4vci/v0/generated.go | 2 +- vcr/api/vcr/v2/generated.go | 2 +- vdr/api/v1/generated.go | 2 +- 14 files changed, 13 insertions(+), 23 deletions(-) delete mode 100644 codegen/README.md diff --git a/api/ssi_types.go b/api/ssi_types.go index de271c8283..aafaebd036 100644 --- a/api/ssi_types.go +++ b/api/ssi_types.go @@ -1,6 +1,6 @@ // Package ssiTypes provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen version v1.15.0 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0 DO NOT EDIT. package ssiTypes // CredentialSubject Subject of a Verifiable Credential identifying the holder and expressing claims. diff --git a/auth/api/auth/v1/client/generated.go b/auth/api/auth/v1/client/generated.go index c2466dc85b..44427a3ffd 100644 --- a/auth/api/auth/v1/client/generated.go +++ b/auth/api/auth/v1/client/generated.go @@ -1,6 +1,6 @@ // Package client provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen version v1.15.0 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0 DO NOT EDIT. package client import ( diff --git a/auth/api/auth/v1/generated.go b/auth/api/auth/v1/generated.go index f04ed9d8e0..c05aaf1bca 100644 --- a/auth/api/auth/v1/generated.go +++ b/auth/api/auth/v1/generated.go @@ -1,6 +1,6 @@ // Package v1 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen version v1.15.0 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0 DO NOT EDIT. package v1 import ( diff --git a/auth/api/iam/generated.go b/auth/api/iam/generated.go index 9549917595..665271d4b1 100644 --- a/auth/api/iam/generated.go +++ b/auth/api/iam/generated.go @@ -1,6 +1,6 @@ // Package iam provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen version v1.15.0 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0 DO NOT EDIT. package iam import ( diff --git a/auth/services/selfsigned/web/generated.go b/auth/services/selfsigned/web/generated.go index a393151569..1985aca95f 100644 --- a/auth/services/selfsigned/web/generated.go +++ b/auth/services/selfsigned/web/generated.go @@ -1,6 +1,6 @@ // Package web provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen version v1.15.0 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0 DO NOT EDIT. package web import ( diff --git a/codegen/README.md b/codegen/README.md deleted file mode 100644 index 7b843e4366..0000000000 --- a/codegen/README.md +++ /dev/null @@ -1,10 +0,0 @@ -As of github.com/deepmap/oapi-codegen/cmd/oapi-codegen@v1.11.0, configuration options for `oapi-codegen` need to be supplied with a yaml config file. - -The structure of the config file is still undocumented, but can be generated using the `oapi-codegen --output-config --old-config-style [ old flags/config options ]`. - -The previously used `--templates` flag to override default templates is now deprecated causing some issues: -- created configs insert the actual templates into the config file as plain text, which defeats the purpose of a template -- plain yaml does not allow importing or referencing to external files -- it is not possible to use old / new style config at the same time, so moving forward we are currently forced to have the templates in the config files - -Future releases of oapi-codegen need to be checked to see if this can be solved in a better way. \ No newline at end of file diff --git a/crypto/api/v1/generated.go b/crypto/api/v1/generated.go index 4fd472c9e8..d2b0a9cf47 100644 --- a/crypto/api/v1/generated.go +++ b/crypto/api/v1/generated.go @@ -1,6 +1,6 @@ // Package v1 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen version v1.15.0 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0 DO NOT EDIT. package v1 import ( diff --git a/crypto/storage/external/generated.go b/crypto/storage/external/generated.go index 74f0f5ec61..bf796027f4 100644 --- a/crypto/storage/external/generated.go +++ b/crypto/storage/external/generated.go @@ -1,6 +1,6 @@ // Package external provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen version v1.15.0 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0 DO NOT EDIT. package external import ( diff --git a/didman/api/v1/generated.go b/didman/api/v1/generated.go index 8ac11c0543..de1e49c9ac 100644 --- a/didman/api/v1/generated.go +++ b/didman/api/v1/generated.go @@ -1,6 +1,6 @@ // Package v1 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen version v1.15.0 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0 DO NOT EDIT. package v1 import ( diff --git a/makefile b/makefile index dcb4e8df8a..6f6efae5be 100644 --- a/makefile +++ b/makefile @@ -3,7 +3,7 @@ run-generators: gen-mocks gen-api gen-protobuf install-tools: - go install github.com/deepmap/oapi-codegen/cmd/oapi-codegen@v1.15.0 + go install github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen@v2.0.0 go install go.uber.org/mock/mockgen@v0.3.0 go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.31.0 go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 diff --git a/network/api/v1/generated.go b/network/api/v1/generated.go index 4858611312..c4cc7b2a45 100644 --- a/network/api/v1/generated.go +++ b/network/api/v1/generated.go @@ -1,6 +1,6 @@ // Package v1 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen version v1.15.0 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0 DO NOT EDIT. package v1 import ( diff --git a/vcr/api/openid4vci/v0/generated.go b/vcr/api/openid4vci/v0/generated.go index 6be1929ab0..51abfbb9e2 100644 --- a/vcr/api/openid4vci/v0/generated.go +++ b/vcr/api/openid4vci/v0/generated.go @@ -1,6 +1,6 @@ // Package v0 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen version v1.15.0 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0 DO NOT EDIT. package v0 import ( diff --git a/vcr/api/vcr/v2/generated.go b/vcr/api/vcr/v2/generated.go index 1f2c316ddb..0e8278bb6a 100644 --- a/vcr/api/vcr/v2/generated.go +++ b/vcr/api/vcr/v2/generated.go @@ -1,6 +1,6 @@ // Package v2 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen version v1.15.0 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0 DO NOT EDIT. package v2 import ( diff --git a/vdr/api/v1/generated.go b/vdr/api/v1/generated.go index 921647b2f2..1ce20aa4ca 100644 --- a/vdr/api/v1/generated.go +++ b/vdr/api/v1/generated.go @@ -1,6 +1,6 @@ // Package v1 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen version v1.15.0 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0 DO NOT EDIT. package v1 import (