From 5c11f54c9655810af4ba31f1eda6301b349f7bb1 Mon Sep 17 00:00:00 2001 From: Gerard Snaauw <33763579+gerardsn@users.noreply.github.com> Date: Wed, 6 Sep 2023 10:33:34 +0200 Subject: [PATCH] Update oapi-codegen to 1.14.0 (#2461) * update oapi-codegen * add comment to go.mod --- api/ssi_types.go | 2 +- auth/api/auth/v1/client/generated.go | 4 +- auth/api/auth/v1/generated.go | 29 ++++++------ auth/api/iam/generated.go | 15 ++++--- auth/services/selfsigned/web/generated.go | 4 +- crypto/api/v1/generated.go | 16 +++---- crypto/storage/external/generated.go | 4 +- didman/api/v1/generated.go | 31 ++++++------- go.mod | 25 ++--------- go.sum | 55 ++--------------------- makefile | 2 +- network/api/v1/generated.go | 25 ++++++----- vcr/api/openid4vci/v0/generated.go | 23 +++++----- vcr/api/vcr/v2/generated.go | 33 +++++++------- vdr/api/v1/generated.go | 23 +++++----- 15 files changed, 117 insertions(+), 174 deletions(-) diff --git a/api/ssi_types.go b/api/ssi_types.go index 48e22407c6..0d41c30c09 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.13.4 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen version v1.14.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 41a2dcc2a9..6aeebcdb49 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.13.4 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen version v1.14.0 DO NOT EDIT. package client import ( @@ -13,7 +13,7 @@ import ( "net/url" "strings" - "github.com/deepmap/oapi-codegen/pkg/runtime" + "github.com/oapi-codegen/runtime" ) const ( diff --git a/auth/api/auth/v1/generated.go b/auth/api/auth/v1/generated.go index 77c64b77e6..5ffe9e8ce7 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.13.4 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen version v1.14.0 DO NOT EDIT. package v1 import ( @@ -9,8 +9,9 @@ import ( "fmt" "net/http" - "github.com/deepmap/oapi-codegen/pkg/runtime" "github.com/labstack/echo/v4" + "github.com/oapi-codegen/runtime" + strictecho "github.com/oapi-codegen/runtime/strictmiddleware/echo" ) const ( @@ -953,8 +954,8 @@ type StrictServerInterface interface { GetContractByType(ctx context.Context, request GetContractByTypeRequestObject) (GetContractByTypeResponseObject, error) } -type StrictHandlerFunc = runtime.StrictEchoHandlerFunc -type StrictMiddlewareFunc = runtime.StrictEchoMiddlewareFunc +type StrictHandlerFunc = strictecho.StrictEchoHandlerFunc +type StrictMiddlewareFunc = strictecho.StrictEchoMiddlewareFunc func NewStrictHandler(ssi StrictServerInterface, middlewares []StrictMiddlewareFunc) ServerInterface { return &strictHandler{ssi: ssi, middlewares: middlewares} @@ -993,7 +994,7 @@ func (sh *strictHandler) IntrospectAccessToken(ctx echo.Context) error { } else if validResponse, ok := response.(IntrospectAccessTokenResponseObject); ok { return validResponse.VisitIntrospectAccessTokenResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -1018,7 +1019,7 @@ func (sh *strictHandler) VerifyAccessToken(ctx echo.Context, params VerifyAccess } else if validResponse, ok := response.(VerifyAccessTokenResponseObject); ok { return validResponse.VisitVerifyAccessTokenResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -1047,7 +1048,7 @@ func (sh *strictHandler) DrawUpContract(ctx echo.Context) error { } else if validResponse, ok := response.(DrawUpContractResponseObject); ok { return validResponse.VisitDrawUpContractResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -1076,7 +1077,7 @@ func (sh *strictHandler) CreateJwtGrant(ctx echo.Context) error { } else if validResponse, ok := response.(CreateJwtGrantResponseObject); ok { return validResponse.VisitCreateJwtGrantResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -1105,7 +1106,7 @@ func (sh *strictHandler) RequestAccessToken(ctx echo.Context) error { } else if validResponse, ok := response.(RequestAccessTokenResponseObject); ok { return validResponse.VisitRequestAccessTokenResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -1134,7 +1135,7 @@ func (sh *strictHandler) CreateSignSession(ctx echo.Context) error { } else if validResponse, ok := response.(CreateSignSessionResponseObject); ok { return validResponse.VisitCreateSignSessionResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -1159,7 +1160,7 @@ func (sh *strictHandler) GetSignSessionStatus(ctx echo.Context, sessionID string } else if validResponse, ok := response.(GetSignSessionStatusResponseObject); ok { return validResponse.VisitGetSignSessionStatusResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -1188,7 +1189,7 @@ func (sh *strictHandler) VerifySignature(ctx echo.Context) error { } else if validResponse, ok := response.(VerifySignatureResponseObject); ok { return validResponse.VisitVerifySignatureResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -1221,7 +1222,7 @@ func (sh *strictHandler) CreateAccessToken(ctx echo.Context) error { } else if validResponse, ok := response.(CreateAccessTokenResponseObject); ok { return validResponse.VisitCreateAccessTokenResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -1247,7 +1248,7 @@ func (sh *strictHandler) GetContractByType(ctx echo.Context, contractType string } else if validResponse, ok := response.(GetContractByTypeResponseObject); ok { return validResponse.VisitGetContractByTypeResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } diff --git a/auth/api/iam/generated.go b/auth/api/iam/generated.go index c41368dff2..da0e6ff451 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.13.4 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen version v1.14.0 DO NOT EDIT. package iam import ( @@ -10,8 +10,9 @@ import ( "io" "net/http" - "github.com/deepmap/oapi-codegen/pkg/runtime" "github.com/labstack/echo/v4" + "github.com/oapi-codegen/runtime" + strictecho "github.com/oapi-codegen/runtime/strictmiddleware/echo" ) // ErrorResponse defines model for ErrorResponse. @@ -365,8 +366,8 @@ type StrictServerInterface interface { HandleTokenRequest(ctx context.Context, request HandleTokenRequestRequestObject) (HandleTokenRequestResponseObject, error) } -type StrictHandlerFunc = runtime.StrictEchoHandlerFunc -type StrictMiddlewareFunc = runtime.StrictEchoMiddlewareFunc +type StrictHandlerFunc = strictecho.StrictEchoHandlerFunc +type StrictMiddlewareFunc = strictecho.StrictEchoMiddlewareFunc func NewStrictHandler(ssi StrictServerInterface, middlewares []StrictMiddlewareFunc) ServerInterface { return &strictHandler{ssi: ssi, middlewares: middlewares} @@ -397,7 +398,7 @@ func (sh *strictHandler) GetOAuthAuthorizationServerMetadata(ctx echo.Context, d } else if validResponse, ok := response.(GetOAuthAuthorizationServerMetadataResponseObject); ok { return validResponse.VisitGetOAuthAuthorizationServerMetadataResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -423,7 +424,7 @@ func (sh *strictHandler) HandleAuthorizeRequest(ctx echo.Context, did string, pa } else if validResponse, ok := response.(HandleAuthorizeRequestResponseObject); ok { return validResponse.VisitHandleAuthorizeRequestResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -458,7 +459,7 @@ func (sh *strictHandler) HandleTokenRequest(ctx echo.Context, did string) error } else if validResponse, ok := response.(HandleTokenRequestResponseObject); ok { return validResponse.VisitHandleTokenRequestResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } diff --git a/auth/services/selfsigned/web/generated.go b/auth/services/selfsigned/web/generated.go index b40ed3fc5f..ac1876bbdc 100644 --- a/auth/services/selfsigned/web/generated.go +++ b/auth/services/selfsigned/web/generated.go @@ -1,14 +1,14 @@ // Package web provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen version v1.13.4 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen version v1.14.0 DO NOT EDIT. package web import ( "fmt" "net/http" - "github.com/deepmap/oapi-codegen/pkg/runtime" "github.com/labstack/echo/v4" + "github.com/oapi-codegen/runtime" ) // Defines values for EmployeeIDFormChoice. diff --git a/crypto/api/v1/generated.go b/crypto/api/v1/generated.go index 050eb36a02..6d19ec5aee 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.13.4 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen version v1.14.0 DO NOT EDIT. package v1 import ( @@ -13,8 +13,8 @@ import ( "net/url" "strings" - "github.com/deepmap/oapi-codegen/pkg/runtime" "github.com/labstack/echo/v4" + strictecho "github.com/oapi-codegen/runtime/strictmiddleware/echo" ) const ( @@ -1116,8 +1116,8 @@ type StrictServerInterface interface { SignJwt(ctx context.Context, request SignJwtRequestObject) (SignJwtResponseObject, error) } -type StrictHandlerFunc = runtime.StrictEchoHandlerFunc -type StrictMiddlewareFunc = runtime.StrictEchoMiddlewareFunc +type StrictHandlerFunc = strictecho.StrictEchoHandlerFunc +type StrictMiddlewareFunc = strictecho.StrictEchoMiddlewareFunc func NewStrictHandler(ssi StrictServerInterface, middlewares []StrictMiddlewareFunc) ServerInterface { return &strictHandler{ssi: ssi, middlewares: middlewares} @@ -1152,7 +1152,7 @@ func (sh *strictHandler) DecryptJwe(ctx echo.Context) error { } else if validResponse, ok := response.(DecryptJweResponseObject); ok { return validResponse.VisitDecryptJweResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -1181,7 +1181,7 @@ func (sh *strictHandler) EncryptJwe(ctx echo.Context) error { } else if validResponse, ok := response.(EncryptJweResponseObject); ok { return validResponse.VisitEncryptJweResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -1210,7 +1210,7 @@ func (sh *strictHandler) SignJws(ctx echo.Context) error { } else if validResponse, ok := response.(SignJwsResponseObject); ok { return validResponse.VisitSignJwsResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -1239,7 +1239,7 @@ func (sh *strictHandler) SignJwt(ctx echo.Context) error { } else if validResponse, ok := response.(SignJwtResponseObject); ok { return validResponse.VisitSignJwtResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } diff --git a/crypto/storage/external/generated.go b/crypto/storage/external/generated.go index 7d4bb47d3b..a0c99acd25 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.13.4 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen version v1.14.0 DO NOT EDIT. package external import ( @@ -13,7 +13,7 @@ import ( "net/url" "strings" - "github.com/deepmap/oapi-codegen/pkg/runtime" + "github.com/oapi-codegen/runtime" ) // Defines values for ServiceStatusStatus. diff --git a/didman/api/v1/generated.go b/didman/api/v1/generated.go index a6a6e54748..59b6228f16 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.13.4 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen version v1.14.0 DO NOT EDIT. package v1 import ( @@ -13,8 +13,9 @@ import ( "net/url" "strings" - "github.com/deepmap/oapi-codegen/pkg/runtime" "github.com/labstack/echo/v4" + "github.com/oapi-codegen/runtime" + strictecho "github.com/oapi-codegen/runtime/strictmiddleware/echo" ) const ( @@ -2792,8 +2793,8 @@ type StrictServerInterface interface { DeleteService(ctx context.Context, request DeleteServiceRequestObject) (DeleteServiceResponseObject, error) } -type StrictHandlerFunc = runtime.StrictEchoHandlerFunc -type StrictMiddlewareFunc = runtime.StrictEchoMiddlewareFunc +type StrictHandlerFunc = strictecho.StrictEchoHandlerFunc +type StrictMiddlewareFunc = strictecho.StrictEchoMiddlewareFunc func NewStrictHandler(ssi StrictServerInterface, middlewares []StrictMiddlewareFunc) ServerInterface { return &strictHandler{ssi: ssi, middlewares: middlewares} @@ -2824,7 +2825,7 @@ func (sh *strictHandler) GetCompoundServices(ctx echo.Context, did string) error } else if validResponse, ok := response.(GetCompoundServicesResponseObject); ok { return validResponse.VisitGetCompoundServicesResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -2855,7 +2856,7 @@ func (sh *strictHandler) AddCompoundService(ctx echo.Context, did string) error } else if validResponse, ok := response.(AddCompoundServiceResponseObject); ok { return validResponse.VisitAddCompoundServiceResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -2883,7 +2884,7 @@ func (sh *strictHandler) GetCompoundServiceEndpoint(ctx echo.Context, did string } else if validResponse, ok := response.(GetCompoundServiceEndpointResponseObject); ok { return validResponse.VisitGetCompoundServiceEndpointResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -2915,7 +2916,7 @@ func (sh *strictHandler) UpdateCompoundService(ctx echo.Context, did string, pTy } else if validResponse, ok := response.(UpdateCompoundServiceResponseObject); ok { return validResponse.VisitUpdateCompoundServiceResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -2940,7 +2941,7 @@ func (sh *strictHandler) GetContactInformation(ctx echo.Context, did string) err } else if validResponse, ok := response.(GetContactInformationResponseObject); ok { return validResponse.VisitGetContactInformationResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -2971,7 +2972,7 @@ func (sh *strictHandler) UpdateContactInformation(ctx echo.Context, did string) } else if validResponse, ok := response.(UpdateContactInformationResponseObject); ok { return validResponse.VisitUpdateContactInformationResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -3002,7 +3003,7 @@ func (sh *strictHandler) AddEndpoint(ctx echo.Context, did string) error { } else if validResponse, ok := response.(AddEndpointResponseObject); ok { return validResponse.VisitAddEndpointResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -3028,7 +3029,7 @@ func (sh *strictHandler) DeleteEndpointsByType(ctx echo.Context, did string, pTy } else if validResponse, ok := response.(DeleteEndpointsByTypeResponseObject); ok { return validResponse.VisitDeleteEndpointsByTypeResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -3060,7 +3061,7 @@ func (sh *strictHandler) UpdateEndpoint(ctx echo.Context, did string, pType stri } else if validResponse, ok := response.(UpdateEndpointResponseObject); ok { return validResponse.VisitUpdateEndpointResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -3085,7 +3086,7 @@ func (sh *strictHandler) SearchOrganizations(ctx echo.Context, params SearchOrga } else if validResponse, ok := response.(SearchOrganizationsResponseObject); ok { return validResponse.VisitSearchOrganizationsResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -3110,7 +3111,7 @@ func (sh *strictHandler) DeleteService(ctx echo.Context, id string) error { } else if validResponse, ok := response.(DeleteServiceResponseObject); ok { return validResponse.VisitDeleteServiceResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } diff --git a/go.mod b/go.mod index 4b349d8228..119522d840 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,6 @@ require ( github.com/avast/retry-go/v4 v4.5.0 github.com/cbroglie/mustache v1.4.0 github.com/chromedp/chromedp v0.9.2 - github.com/deepmap/oapi-codegen v1.13.4 github.com/dlclark/regexp2 v1.10.0 github.com/golang-jwt/jwt v3.2.2+incompatible github.com/goodsign/monday v1.0.1 @@ -25,6 +24,8 @@ require ( github.com/nuts-foundation/go-did v0.6.3 github.com/nuts-foundation/go-leia/v4 v4.0.0 github.com/nuts-foundation/go-stoabs v1.9.0 + // check the oapi-codegen tool version in the makefile when upgrading the runtime + github.com/oapi-codegen/runtime v1.0.0 github.com/piprate/json-gold v0.5.1-0.20230111113000-6ddbe6e6f19f github.com/privacybydesign/irmago v0.12.6 github.com/prometheus/client_golang v1.16.0 @@ -61,12 +62,9 @@ require ( github.com/bwesterb/go-exptable v1.0.0 // indirect github.com/bwesterb/go-pow v1.0.0 // indirect github.com/bwesterb/go-xmssmt v1.5.2 // indirect - github.com/bytedance/sonic v1.10.0-rc3 // indirect github.com/cenkalti/backoff/v3 v3.0.0 // indirect github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect - github.com/chenzhuoyu/iasm v0.9.0 // indirect github.com/chromedp/cdproto v0.0.0-20230802225258-3cf4e6d46a89 // indirect github.com/chromedp/sysutil v1.0.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -78,16 +76,10 @@ require ( github.com/fatih/structs v1.1.0 // indirect github.com/fsnotify/fsnotify v1.5.4 // indirect github.com/fxamacker/cbor v1.5.1 // indirect - github.com/gabriel-vasile/mimetype v1.4.2 // indirect - github.com/gin-contrib/sse v0.1.0 // indirect - github.com/gin-gonic/gin v1.9.1 // indirect github.com/go-chi/chi/v5 v5.0.10 // indirect github.com/go-co-op/gocron v1.14.0 // indirect github.com/go-errors/errors v1.4.2 // indirect github.com/go-jose/go-jose/v3 v3.0.0 // indirect - github.com/go-playground/locales v0.14.1 // indirect - github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-playground/validator/v10 v10.14.1 // indirect github.com/go-redis/redis/v8 v8.11.5 // indirect github.com/go-redsync/redsync/v4 v4.8.1 // indirect github.com/go-sql-driver/mysql v1.6.0 // indirect @@ -97,7 +89,6 @@ require ( github.com/goccy/go-json v0.10.2 // indirect github.com/golang-jwt/jwt/v4 v4.4.1 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/golang/snappy v0.0.4 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect @@ -111,12 +102,9 @@ require ( github.com/jinzhu/gorm v1.9.16 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/josharian/intern v1.0.0 // indirect - github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.16.7 // indirect - github.com/klauspost/cpuid/v2 v2.2.5 // indirect github.com/kr/text v0.2.0 // indirect github.com/labstack/gommon v0.4.0 // indirect - github.com/leodido/go-urn v1.2.4 // indirect github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect github.com/lestrrat-go/blackmagic v1.0.1 // indirect github.com/lestrrat-go/httpcc v1.0.1 // indirect @@ -135,15 +123,12 @@ require ( github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect - github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect - github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mr-tron/base58 v1.1.3 // indirect github.com/multiformats/go-multihash v0.0.11 // indirect github.com/nats-io/jwt/v2 v2.4.1 // indirect github.com/nats-io/nkeys v0.4.4 // indirect github.com/nats-io/nuid v1.0.1 // indirect github.com/nightlyone/lockfile v1.0.0 // indirect - github.com/pelletier/go-toml/v2 v2.0.9 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect @@ -151,6 +136,7 @@ require ( github.com/prometheus/common v0.42.0 // indirect github.com/prometheus/procfs v0.10.1 // indirect github.com/robfig/cron/v3 v3.0.1 // indirect + github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/ryanuber/go-glob v1.0.0 // indirect github.com/shopspring/decimal v1.3.1 // indirect github.com/sietseringers/go-sse v0.0.0-20200801161811-e2cf2c63ca50 // indirect @@ -161,15 +147,12 @@ require ( github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.0 // indirect github.com/timshannon/bolthold v0.0.0-20210913165410-232392fc8a6a // indirect - github.com/twitchyliquid64/golang-asm v0.15.1 // indirect - github.com/ugorji/go/codec v1.2.11 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v1.2.2 // indirect github.com/x-cray/logrus-prefixed-formatter v0.5.2 // indirect github.com/x448/float16 v0.8.4 // indirect github.com/yuin/gopher-lua v1.1.0 // indirect - golang.org/x/arch v0.4.0 // indirect - golang.org/x/net v0.12.0 // indirect + golang.org/x/net v0.14.0 // indirect golang.org/x/sync v0.2.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/term v0.11.0 // indirect diff --git a/go.sum b/go.sum index adcc71c80e..08336c3a6e 100644 --- a/go.sum +++ b/go.sum @@ -66,10 +66,6 @@ github.com/bwesterb/go-pow v1.0.0 h1:QZ+LZMmZZYjqesKIr4nFCKAGIpLPePO/klHVSlzbvbo github.com/bwesterb/go-pow v1.0.0/go.mod h1:Px3tTFyb+vzbrJYKBqyrxp+3MY8KRP6mbAk74iayAyY= github.com/bwesterb/go-xmssmt v1.5.2 h1:nnPnAgBFVlxwMKozJmgBeWOVZCu1PQbxSYE5UqKHe8s= github.com/bwesterb/go-xmssmt v1.5.2/go.mod h1:Eob3lpFvWHYREWk+ao/vRFirdciRHF7w2z4NhAfozmA= -github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= -github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM= -github.com/bytedance/sonic v1.10.0-rc3 h1:uNSnscRapXTwUgTyOF0GVljYD08p9X/Lbr9MweSV3V0= -github.com/bytedance/sonic v1.10.0-rc3/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4= github.com/cbroglie/mustache v1.4.0 h1:Azg0dVhxTml5me+7PsZ7WPrQq1Gkf3WApcHMjMprYoU= github.com/cbroglie/mustache v1.4.0/go.mod h1:SS1FTIghy0sjse4DUVGV1k/40B1qE1XkD9DtDsHo9iM= github.com/cenkalti/backoff/v3 v3.0.0 h1:ske+9nBpD9qZsTBoF41nW5L+AIuFBKMeze18XQ3eG1c= @@ -81,12 +77,6 @@ github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= -github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= -github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ0g/qfRdp61a3Uu/AWrgIq2s0ClJV1g0= -github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpVsBuRksnlj1mLy4AWzRNQYxauNi62uWcE3to6eA= -github.com/chenzhuoyu/iasm v0.9.0 h1:9fhXjVzq5hUy2gkhhgHl95zG2cEAhw9OSGs8toWWAwo= -github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= github.com/chromedp/cdproto v0.0.0-20230802225258-3cf4e6d46a89 h1:aPflPkRFkVwbW6dmcVqfgwp1i+UWGFH6VgR1Jim5Ygc= github.com/chromedp/cdproto v0.0.0-20230802225258-3cf4e6d46a89/go.mod h1:GKljq0VrfU4D5yc+2qA6OVr8pmO/MBbPEWqWQ/oqGEs= github.com/chromedp/chromedp v0.9.2 h1:dKtNz4kApb06KuSXoTQIyUC2TrA0fhGDwNZf3bcgfKw= @@ -109,8 +99,6 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0= -github.com/deepmap/oapi-codegen v1.13.4 h1:lRRQ8JAXaz5/4oidKFyk3fFZFQsbv0BzRtvDKDnvIfM= -github.com/deepmap/oapi-codegen v1.13.4/go.mod h1:/h5nFQbTAMz4S/WtBz8sBfamlGByYKDr21O2uoNgCYI= github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd h1:83Wprp6ROGeiHFAP8WJdI2RoxALQYgdllERc3N5N2DM= github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= github.com/dgraph-io/badger/v4 v4.1.0 h1:E38jc0f+RATYrycSUf9LMv/t47XAy+3CApyYSq4APOQ= @@ -147,13 +135,7 @@ github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmV github.com/fxamacker/cbor v1.5.0/go.mod h1:UjdWSysJckWsChYy9I5zMbkGvK4xXDR+LmDb8kPGYgA= github.com/fxamacker/cbor v1.5.1 h1:XjQWBgdmQyqimslUh5r4tUGmoqzHmBFQOImkWGi2awg= github.com/fxamacker/cbor v1.5.1/go.mod h1:3aPGItF174ni7dDzd6JZ206H8cmr4GDNBGpPa971zsU= -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/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= -github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg= -github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU= github.com/go-chi/chi/v5 v5.0.10 h1:rLz5avzKpjqxrYwXNfmjkrYYXOyLJd37pz53UFHC6vk= github.com/go-chi/chi/v5 v5.0.10/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/go-co-op/gocron v1.14.0 h1:Fphr0ZWKtr6V33jjUdhF7ggwI0idt/RxBxwybIwr6Zo= @@ -170,14 +152,6 @@ github.com/go-ldap/ldap v3.0.2+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= -github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= -github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= -github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= -github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= -github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= -github.com/go-playground/validator/v10 v10.14.1 h1:9c50NUPC30zyuKprjL3vNZ0m5oG+jU0zvx4AqHGnv4k= -github.com/go-playground/validator/v10 v10.14.1/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg= github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= github.com/go-redis/redis/v7 v7.4.0 h1:7obg6wUoj05T0EpY0o8B59S9w5yeMWql7sw2kwNW1x4= @@ -337,8 +311,6 @@ github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= -github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPciBPrBUjwbNvtwB6RQlve+hkpll6QSNmOE= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= @@ -346,12 +318,8 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= -github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= -github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/knadh/koanf v1.5.0 h1:q2TSd/3Pyc/5yP9ldIrSdIz26MCcyNQzW0pEAugLPNs= github.com/knadh/koanf v1.5.0/go.mod h1:Hgyjp4y8v44hpZtPzs7JZfRAW5AhN7KfZcwv1RYggDs= -github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= @@ -369,8 +337,6 @@ github.com/labstack/gommon v0.4.0 h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8 github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM= github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80 h1:6Yzfa6GP0rIo/kULo2bwGEkFvCePZ3qHDDTC3/J9Swo= github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs= -github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q= -github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4= github.com/lestrrat-go/backoff/v2 v2.0.8 h1:oNb5E5isby2kiro9AgdHLv5N5tint1AnDVVf2E2un5A= github.com/lestrrat-go/backoff/v2 v2.0.8/go.mod h1:rHP/q/r9aT27n24JQLa7JhSQZCKBBOiM/uP402WwN8Y= github.com/lestrrat-go/blackmagic v1.0.1 h1:lS5Zts+5HIC/8og6cGHb0uCcNCa3OUt1ygh3Qz2Fe80= @@ -445,12 +411,9 @@ github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= -github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mr-tron/base58 v1.1.3 h1:v+sk57XuaCKGXpWtVBX8YJzO7hMGx4Aajh4TQbdEFdc= github.com/mr-tron/base58 v1.1.3/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= github.com/multiformats/go-multihash v0.0.11 h1:yEyBxwoR/7vBM5NfLVXRnpQNVLrMhpS6MRb7Z/1pnzc= @@ -481,6 +444,8 @@ github.com/nuts-foundation/go-stoabs v1.9.0/go.mod h1:htbUqSZiaihqAvJfHwtAbQusGa github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= +github.com/oapi-codegen/runtime v1.0.0 h1:P4rqFX5fMFWqRzY9M/3YF9+aPSPPB06IzP2P7oOxrWo= +github.com/oapi-codegen/runtime v1.0.0/go.mod h1:LmCUMQuPB4M/nLXilQXhHw+BLZdDb18B34OO356yJ/A= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -502,8 +467,6 @@ github.com/pascaldekloe/name v0.0.0-20180628100202-0fd16699aae1/go.mod h1:eD5Jxq github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml/v2 v2.0.9 h1:uH2qQXheeefCCkuBBSLi7jCiSmj3VRh2+Goq2N7Xxu0= -github.com/pelletier/go-toml/v2 v2.0.9/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/piprate/json-gold v0.5.1-0.20230111113000-6ddbe6e6f19f h1:HlPa7RcxTCrva5izPfTEfvYecO7LTahgmMRD1Qp13xg= github.com/piprate/json-gold v0.5.1-0.20230111113000-6ddbe6e6f19f/go.mod h1:WZ501QQMbZZ+3pXFPhQKzNwS1+jls0oqov3uQ2WasLs= @@ -591,7 +554,6 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stvp/tempredis v0.0.0-20181119212430-b82af8480203 h1:QVqDTf3h2WHt08YuiTGPZLls0Wq99X9bWd0Q5ZSBesM= @@ -611,12 +573,8 @@ github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= github.com/timshannon/bolthold v0.0.0-20210913165410-232392fc8a6a h1:oIi7H/bwFUYKYhzKbHc+3MvHRWqhQwXVB4LweLMiVy0= github.com/timshannon/bolthold v0.0.0-20210913165410-232392fc8a6a/go.mod h1:iSvujNDmpZ6eQX+bg/0X3lF7LEmZ8N77g2a/J/+Zt2U= -github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= -github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/twmb/murmur3 v1.1.8 h1:8Yt9taO/WN3l08xErzjeschgZU2QSrwm1kclYq+0aRg= github.com/twmb/murmur3 v1.1.8/go.mod h1:Qq/R7NUyOfr65zD+6Q5IHKsJLwP7exErjN6lyyq3OSQ= -github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU= -github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= @@ -651,9 +609,6 @@ go.uber.org/mock v0.2.0 h1:TaP3xedm7JaAgScZO7tlvlKrqT0p7I6OsdGB5YNSMDU= go.uber.org/mock v0.2.0/go.mod h1:J0y0rp9L3xiff1+ZBfKxlC1fz2+aO16tw0tsDOixfuM= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= -golang.org/x/arch v0.4.0 h1:A8WCeEWhLwPBKNbFi5Wv5UTCBx5zzubnXDlMOFAzFMc= -golang.org/x/arch v0.4.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -708,8 +663,8 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= -golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= +golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= +golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -884,8 +839,6 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= -rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/qr v0.2.0 h1:6vBLea5/NRMVTz8V66gipeLycZMl/+UlFmk8DvqQ6WY= rsc.io/qr v0.2.0/go.mod h1:IF+uZjkb9fqyeF/4tlBoynqmQxUoPfWEKh921coOuXs= schneider.vip/problem v1.8.1 h1:oAgLMu286aNHgvjuoR1PowYx+7hyBUjyzbrFPR1dEMI= diff --git a/makefile b/makefile index 41531510d8..b0758df3e2 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.13.4 + go install github.com/deepmap/oapi-codegen/cmd/oapi-codegen@v1.14.0 go install go.uber.org/mock/mockgen@v0.1.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 167813e1a9..f4f20a38b4 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.13.4 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen version v1.14.0 DO NOT EDIT. package v1 import ( @@ -13,8 +13,9 @@ import ( "strings" "time" - "github.com/deepmap/oapi-codegen/pkg/runtime" "github.com/labstack/echo/v4" + "github.com/oapi-codegen/runtime" + strictecho "github.com/oapi-codegen/runtime/strictmiddleware/echo" ) const ( @@ -1793,8 +1794,8 @@ type StrictServerInterface interface { GetTransactionPayload(ctx context.Context, request GetTransactionPayloadRequestObject) (GetTransactionPayloadResponseObject, error) } -type StrictHandlerFunc = runtime.StrictEchoHandlerFunc -type StrictMiddlewareFunc = runtime.StrictEchoMiddlewareFunc +type StrictHandlerFunc = strictecho.StrictEchoHandlerFunc +type StrictMiddlewareFunc = strictecho.StrictEchoMiddlewareFunc func NewStrictHandler(ssi StrictServerInterface, middlewares []StrictMiddlewareFunc) ServerInterface { return &strictHandler{ssi: ssi, middlewares: middlewares} @@ -1823,7 +1824,7 @@ func (sh *strictHandler) GetAddressBook(ctx echo.Context) error { } else if validResponse, ok := response.(GetAddressBookResponseObject); ok { return validResponse.VisitGetAddressBookResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -1848,7 +1849,7 @@ func (sh *strictHandler) RenderGraph(ctx echo.Context, params RenderGraphParams) } else if validResponse, ok := response.(RenderGraphResponseObject); ok { return validResponse.VisitRenderGraphResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -1871,7 +1872,7 @@ func (sh *strictHandler) GetPeerDiagnostics(ctx echo.Context) error { } else if validResponse, ok := response.(GetPeerDiagnosticsResponseObject); ok { return validResponse.VisitGetPeerDiagnosticsResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -1894,7 +1895,7 @@ func (sh *strictHandler) ListEvents(ctx echo.Context) error { } else if validResponse, ok := response.(ListEventsResponseObject); ok { return validResponse.VisitListEventsResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -1919,7 +1920,7 @@ func (sh *strictHandler) Reprocess(ctx echo.Context, params ReprocessParams) err } else if validResponse, ok := response.(ReprocessResponseObject); ok { return validResponse.VisitReprocessResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -1944,7 +1945,7 @@ func (sh *strictHandler) ListTransactions(ctx echo.Context, params ListTransacti } else if validResponse, ok := response.(ListTransactionsResponseObject); ok { return validResponse.VisitListTransactionsResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -1969,7 +1970,7 @@ func (sh *strictHandler) GetTransaction(ctx echo.Context, ref string) error { } else if validResponse, ok := response.(GetTransactionResponseObject); ok { return validResponse.VisitGetTransactionResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -1994,7 +1995,7 @@ func (sh *strictHandler) GetTransactionPayload(ctx echo.Context, ref string) err } else if validResponse, ok := response.(GetTransactionPayloadResponseObject); ok { return validResponse.VisitGetTransactionPayloadResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } diff --git a/vcr/api/openid4vci/v0/generated.go b/vcr/api/openid4vci/v0/generated.go index a48adb163c..b5f2db08af 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.13.4 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen version v1.14.0 DO NOT EDIT. package v0 import ( @@ -9,8 +9,9 @@ import ( "fmt" "net/http" - "github.com/deepmap/oapi-codegen/pkg/runtime" "github.com/labstack/echo/v4" + "github.com/oapi-codegen/runtime" + strictecho "github.com/oapi-codegen/runtime/strictmiddleware/echo" ) // RequestCredentialParams defines parameters for RequestCredential. @@ -499,8 +500,8 @@ type StrictServerInterface interface { RequestAccessToken(ctx context.Context, request RequestAccessTokenRequestObject) (RequestAccessTokenResponseObject, error) } -type StrictHandlerFunc = runtime.StrictEchoHandlerFunc -type StrictMiddlewareFunc = runtime.StrictEchoMiddlewareFunc +type StrictHandlerFunc = strictecho.StrictEchoHandlerFunc +type StrictMiddlewareFunc = strictecho.StrictEchoMiddlewareFunc func NewStrictHandler(ssi StrictServerInterface, middlewares []StrictMiddlewareFunc) ServerInterface { return &strictHandler{ssi: ssi, middlewares: middlewares} @@ -531,7 +532,7 @@ func (sh *strictHandler) GetOIDCProviderMetadata(ctx echo.Context, did string) e } else if validResponse, ok := response.(GetOIDCProviderMetadataResponseObject); ok { return validResponse.VisitGetOIDCProviderMetadataResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -556,7 +557,7 @@ func (sh *strictHandler) GetOpenID4VCIIssuerMetadata(ctx echo.Context, did strin } else if validResponse, ok := response.(GetOpenID4VCIIssuerMetadataResponseObject); ok { return validResponse.VisitGetOpenID4VCIIssuerMetadataResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -581,7 +582,7 @@ func (sh *strictHandler) GetOpenID4VCIIssuerMetadataHeaders(ctx echo.Context, di } else if validResponse, ok := response.(GetOpenID4VCIIssuerMetadataHeadersResponseObject); ok { return validResponse.VisitGetOpenID4VCIIssuerMetadataHeadersResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -606,7 +607,7 @@ func (sh *strictHandler) GetOAuth2ClientMetadata(ctx echo.Context, did string) e } else if validResponse, ok := response.(GetOAuth2ClientMetadataResponseObject); ok { return validResponse.VisitGetOAuth2ClientMetadataResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -638,7 +639,7 @@ func (sh *strictHandler) RequestCredential(ctx echo.Context, did string, params } else if validResponse, ok := response.(RequestCredentialResponseObject); ok { return validResponse.VisitRequestCredentialResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -664,7 +665,7 @@ func (sh *strictHandler) HandleCredentialOffer(ctx echo.Context, did string, par } else if validResponse, ok := response.(HandleCredentialOfferResponseObject); ok { return validResponse.VisitHandleCredentialOfferResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -699,7 +700,7 @@ func (sh *strictHandler) RequestAccessToken(ctx echo.Context, did string) error } else if validResponse, ok := response.(RequestAccessTokenResponseObject); ok { return validResponse.VisitRequestAccessTokenResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } diff --git a/vcr/api/vcr/v2/generated.go b/vcr/api/vcr/v2/generated.go index f3797b7797..cce1699df4 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.13.4 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen version v1.14.0 DO NOT EDIT. package v2 import ( @@ -13,8 +13,9 @@ import ( "net/url" "strings" - "github.com/deepmap/oapi-codegen/pkg/runtime" "github.com/labstack/echo/v4" + "github.com/oapi-codegen/runtime" + strictecho "github.com/oapi-codegen/runtime/strictmiddleware/echo" ) const ( @@ -2955,8 +2956,8 @@ type StrictServerInterface interface { ListUntrusted(ctx context.Context, request ListUntrustedRequestObject) (ListUntrustedResponseObject, error) } -type StrictHandlerFunc = runtime.StrictEchoHandlerFunc -type StrictMiddlewareFunc = runtime.StrictEchoMiddlewareFunc +type StrictHandlerFunc = strictecho.StrictEchoHandlerFunc +type StrictMiddlewareFunc = strictecho.StrictEchoMiddlewareFunc func NewStrictHandler(ssi StrictServerInterface, middlewares []StrictMiddlewareFunc) ServerInterface { return &strictHandler{ssi: ssi, middlewares: middlewares} @@ -2991,7 +2992,7 @@ func (sh *strictHandler) CreateVP(ctx echo.Context) error { } else if validResponse, ok := response.(CreateVPResponseObject); ok { return validResponse.VisitCreateVPResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -3020,7 +3021,7 @@ func (sh *strictHandler) IssueVC(ctx echo.Context) error { } else if validResponse, ok := response.(IssueVCResponseObject); ok { return validResponse.VisitIssueVCResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -3045,7 +3046,7 @@ func (sh *strictHandler) SearchIssuedVCs(ctx echo.Context, params SearchIssuedVC } else if validResponse, ok := response.(SearchIssuedVCsResponseObject); ok { return validResponse.VisitSearchIssuedVCsResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -3070,7 +3071,7 @@ func (sh *strictHandler) RevokeVC(ctx echo.Context, id string) error { } else if validResponse, ok := response.(RevokeVCResponseObject); ok { return validResponse.VisitRevokeVCResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -3099,7 +3100,7 @@ func (sh *strictHandler) SearchVCs(ctx echo.Context) error { } else if validResponse, ok := response.(SearchVCsResponseObject); ok { return validResponse.VisitSearchVCsResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -3124,7 +3125,7 @@ func (sh *strictHandler) ResolveVC(ctx echo.Context, id string) error { } else if validResponse, ok := response.(ResolveVCResponseObject); ok { return validResponse.VisitResolveVCResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -3153,7 +3154,7 @@ func (sh *strictHandler) UntrustIssuer(ctx echo.Context) error { } else if validResponse, ok := response.(UntrustIssuerResponseObject); ok { return validResponse.VisitUntrustIssuerResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -3182,7 +3183,7 @@ func (sh *strictHandler) TrustIssuer(ctx echo.Context) error { } else if validResponse, ok := response.(TrustIssuerResponseObject); ok { return validResponse.VisitTrustIssuerResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -3211,7 +3212,7 @@ func (sh *strictHandler) VerifyVC(ctx echo.Context) error { } else if validResponse, ok := response.(VerifyVCResponseObject); ok { return validResponse.VisitVerifyVCResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -3240,7 +3241,7 @@ func (sh *strictHandler) VerifyVP(ctx echo.Context) error { } else if validResponse, ok := response.(VerifyVPResponseObject); ok { return validResponse.VisitVerifyVPResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -3265,7 +3266,7 @@ func (sh *strictHandler) ListTrusted(ctx echo.Context, credentialType string) er } else if validResponse, ok := response.(ListTrustedResponseObject); ok { return validResponse.VisitListTrustedResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -3290,7 +3291,7 @@ func (sh *strictHandler) ListUntrusted(ctx echo.Context, credentialType string) } else if validResponse, ok := response.(ListUntrustedResponseObject); ok { return validResponse.VisitListUntrustedResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } diff --git a/vdr/api/v1/generated.go b/vdr/api/v1/generated.go index 4705373ad0..c8d93a0f90 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.13.4 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen version v1.14.0 DO NOT EDIT. package v1 import ( @@ -13,8 +13,9 @@ import ( "net/url" "strings" - "github.com/deepmap/oapi-codegen/pkg/runtime" "github.com/labstack/echo/v4" + "github.com/oapi-codegen/runtime" + strictecho "github.com/oapi-codegen/runtime/strictmiddleware/echo" ) const ( @@ -1750,8 +1751,8 @@ type StrictServerInterface interface { DeleteVerificationMethod(ctx context.Context, request DeleteVerificationMethodRequestObject) (DeleteVerificationMethodResponseObject, error) } -type StrictHandlerFunc = runtime.StrictEchoHandlerFunc -type StrictMiddlewareFunc = runtime.StrictEchoMiddlewareFunc +type StrictHandlerFunc = strictecho.StrictEchoHandlerFunc +type StrictMiddlewareFunc = strictecho.StrictEchoMiddlewareFunc func NewStrictHandler(ssi StrictServerInterface, middlewares []StrictMiddlewareFunc) ServerInterface { return &strictHandler{ssi: ssi, middlewares: middlewares} @@ -1786,7 +1787,7 @@ func (sh *strictHandler) CreateDID(ctx echo.Context) error { } else if validResponse, ok := response.(CreateDIDResponseObject); ok { return validResponse.VisitCreateDIDResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -1809,7 +1810,7 @@ func (sh *strictHandler) ConflictedDIDs(ctx echo.Context) error { } else if validResponse, ok := response.(ConflictedDIDsResponseObject); ok { return validResponse.VisitConflictedDIDsResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -1834,7 +1835,7 @@ func (sh *strictHandler) DeactivateDID(ctx echo.Context, did string) error { } else if validResponse, ok := response.(DeactivateDIDResponseObject); ok { return validResponse.VisitDeactivateDIDResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -1860,7 +1861,7 @@ func (sh *strictHandler) GetDID(ctx echo.Context, did string, params GetDIDParam } else if validResponse, ok := response.(GetDIDResponseObject); ok { return validResponse.VisitGetDIDResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -1891,7 +1892,7 @@ func (sh *strictHandler) UpdateDID(ctx echo.Context, did string) error { } else if validResponse, ok := response.(UpdateDIDResponseObject); ok { return validResponse.VisitUpdateDIDResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -1922,7 +1923,7 @@ func (sh *strictHandler) AddNewVerificationMethod(ctx echo.Context, did string) } else if validResponse, ok := response.(AddNewVerificationMethodResponseObject); ok { return validResponse.VisitAddNewVerificationMethodResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil } @@ -1948,7 +1949,7 @@ func (sh *strictHandler) DeleteVerificationMethod(ctx echo.Context, did string, } else if validResponse, ok := response.(DeleteVerificationMethodResponseObject); ok { return validResponse.VisitDeleteVerificationMethodResponse(ctx.Response()) } else if response != nil { - return fmt.Errorf("Unexpected response type: %T", response) + return fmt.Errorf("unexpected response type: %T", response) } return nil }