diff --git a/go.mod b/go.mod index 0a8611a3..ad69be12 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/Masterminds/squirrel v1.5.4 - github.com/deepmap/oapi-codegen v1.12.4 + github.com/deepmap/oapi-codegen v1.13.0 github.com/getkin/kin-openapi v0.118.0 github.com/golang-jwt/jwt/v4 v4.5.0 github.com/golang-migrate/migrate/v4 v4.16.1 @@ -37,16 +37,25 @@ require ( github.com/agext/levenshtein v1.2.1 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect + github.com/bytedance/sonic v1.9.1 // indirect github.com/cenkalti/backoff/v4 v4.1.3 // indirect + github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect github.com/containerd/continuity v0.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/docker/cli v20.10.17+incompatible // indirect github.com/docker/docker v20.10.24+incompatible // indirect github.com/docker/go-connections v0.4.0 // indirect github.com/docker/go-units v0.5.0 // 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-jose/go-jose/v3 v3.0.0 // indirect github.com/go-openapi/jsonpointer v0.19.5 // indirect github.com/go-openapi/swag v0.21.1 // 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.0 // indirect + github.com/goccy/go-json v0.10.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt v3.2.2+incompatible // indirect github.com/golang/protobuf v1.5.3 // indirect @@ -60,24 +69,32 @@ require ( github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect github.com/josharian/intern v1.0.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect + github.com/klauspost/cpuid/v2 v2.2.4 // indirect github.com/labstack/gommon v0.4.0 // indirect github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect + github.com/leodido/go-urn v1.2.4 // indirect github.com/lib/pq v1.10.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.17 // indirect + github.com/mattn/go-isatty v0.0.19 // indirect github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 // indirect github.com/mitchellh/mapstructure v1.4.1 // indirect github.com/moby/term v0.5.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/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.2 // indirect github.com/opencontainers/runc v1.1.5 // indirect + github.com/pelletier/go-toml/v2 v2.0.8 // indirect github.com/perimeterx/marshmallow v1.1.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // 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/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect @@ -86,13 +103,14 @@ require ( github.com/zclconf/go-cty v1.13.0 // indirect github.com/zeebo/errs v1.3.0 // indirect go.uber.org/atomic v1.10.0 // indirect + golang.org/x/arch v0.3.0 // indirect golang.org/x/crypto v0.9.0 // indirect golang.org/x/mod v0.10.0 // indirect golang.org/x/net v0.10.0 // indirect golang.org/x/sys v0.8.0 // indirect golang.org/x/text v0.9.0 // indirect golang.org/x/time v0.3.0 // indirect - golang.org/x/tools v0.9.1 // indirect + golang.org/x/tools v0.9.2 // indirect google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect google.golang.org/protobuf v1.30.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index 64aa4153..43cf188b 100644 --- a/go.sum +++ b/go.sum @@ -19,11 +19,17 @@ github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw= github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo= github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w= +github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= +github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s= +github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U= github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E= +github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= +github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams= +github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= @@ -48,8 +54,8 @@ github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/deepmap/oapi-codegen v1.12.4 h1:pPmn6qI9MuOtCz82WY2Xaw46EQjgvxednXXrP7g5Q2s= -github.com/deepmap/oapi-codegen v1.12.4/go.mod h1:3lgHGMu6myQ2vqbbTXH2H1o4eXFTGnFiDaOaKKl5yas= +github.com/deepmap/oapi-codegen v1.13.0 h1:cnFHelhsRQbYvanCUAbRSn/ZpkUb1HPRlQcu8YqSORQ= +github.com/deepmap/oapi-codegen v1.13.0/go.mod h1:Amy7tbubKY9qkZOXqymI3Z6xSbndmu+atMJheLdyg44= github.com/dhui/dktest v0.3.16 h1:i6gq2YQEtcrjKbeJpBkWjE8MmLZPYllcjOFbTZuPDnw= github.com/docker/cli v20.10.17+incompatible h1:eO2KS7ZFeov5UJeaDmIs1NFEDRf32PaqRpvoEkKBy5M= github.com/docker/cli v20.10.17+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= @@ -70,9 +76,15 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= +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/getkin/kin-openapi v0.118.0 h1:z43njxPmJ7TaPpMSCQb7PN0dEYno4tyBPQcrFdHoLuM= github.com/getkin/kin-openapi v0.118.0/go.mod h1:l5e9PaFUo9fyLJCPGQeXI2ML8c3P8BHOEV2VaAVf/pc= 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-jose/go-jose/v3 v3.0.0 h1:s6rrhirfEP/CGIoc6p+PZAeogN2SxKav6Wp7+dyMWVo= github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= @@ -82,10 +94,19 @@ github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.21.1 h1:wm0rhTb5z7qpJRHBdPOMuY4QjVUMbF6/kwoYeRAOrKU= github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= +github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= +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.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js= +github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM= github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= +github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= +github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= @@ -125,6 +146,7 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= @@ -197,11 +219,16 @@ github.com/jmhodges/clock v1.2.0 h1:eq4kys+NI0PLngzaHEe7AmPT90XMGIEySD1JfV1PDIs= github.com/jmhodges/clock v1.2.0/go.mod h1:qKjhA7x7u/lQpPB1XAqX1b1lCI/w3/fNuYpI/ZjLynI= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= +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/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= +github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk= +github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= 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.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= @@ -221,6 +248,8 @@ github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtBTC4WfIxhKZfyBF/HBFgRZSWwZ9g/He9o= github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 h1:P6pPBnrTSX3DEVR4fDembhRWSsG5rVo6hYhAB/ADZrk= github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6FmdpVm2joNMFikkuWg0EoCKLGUMNw= +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/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= @@ -241,8 +270,8 @@ github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= -github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= +github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM= github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 h1:DpOJ2HYzCv8LZP15IdmG+YdwD2luVPHITV96TkirNBM= @@ -252,6 +281,11 @@ github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= +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 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= @@ -267,6 +301,8 @@ github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.m github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= github.com/ory/dockertest/v3 v3.10.0 h1:4K3z2VMe8Woe++invjaTB7VRyQXQy5UY+loujO4aNE4= github.com/ory/dockertest/v3 v3.10.0/go.mod h1:nr57ZbRWMqfsdGdFNLHz5jjNdDb7VVFnzAeW1n5N1Lg= +github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= +github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= github.com/perimeterx/marshmallow v1.1.4 h1:pZLDH9RjlLGGorbXhcaQLhfuV0pFMNfPO55FuFkxqLw= github.com/perimeterx/marshmallow v1.1.4/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -319,13 +355,17 @@ 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.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= -github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= +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/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= -github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= +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.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= @@ -361,6 +401,9 @@ go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9E go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= +golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= +golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k= +golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -435,8 +478,10 @@ golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= @@ -465,8 +510,8 @@ golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo= -golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= +golang.org/x/tools v0.9.2 h1:UXbndbirwCAx6TULftIfie/ygDNCwxEie+IiNP1IcNc= +golang.org/x/tools v0.9.2/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -558,3 +603,4 @@ modernc.org/tcl v1.13.1 h1:npxzTwFTZYM8ghWicVIX1cRWzj7Nd8i6AqqX2p+IYao= modernc.org/token v1.0.0 h1:a0jaWiNMDhDUtqOj09wvjWWAqd3q7WpBulmL9H2egsk= modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= modernc.org/z v1.5.1 h1:RTNHdsrOpeoSeOF4FbzTo8gBYByaJ5xT7NgZ9ZqRiJM= +rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= diff --git a/pkg/common/api/schemas.gen.go b/pkg/common/api/schemas.gen.go index 7577bb7c..9520b7d6 100644 --- a/pkg/common/api/schemas.gen.go +++ b/pkg/common/api/schemas.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen version v1.12.4 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen version v1.13.0 DO NOT EDIT. package api import ( diff --git a/pkg/harvester/api/admin/admin.gen.go b/pkg/harvester/api/admin/admin.gen.go index 605dce03..8aba85b6 100644 --- a/pkg/harvester/api/admin/admin.gen.go +++ b/pkg/harvester/api/admin/admin.gen.go @@ -1,6 +1,6 @@ // Package admin provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen version v1.12.4 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen version v1.13.0 DO NOT EDIT. package admin import ( @@ -179,26 +179,28 @@ func NewGetRelationshipsRequest(server string, params *GetRelationshipsParams) ( return nil, err } - queryValues := queryURL.Query() + if params != nil { + queryValues := queryURL.Query() - if params.ConsentStatus != nil { + if params.ConsentStatus != nil { - if queryFrag, err := runtime.StyleParamWithLocation("form", true, "consentStatus", runtime.ParamLocationQuery, *params.ConsentStatus); err != nil { - return nil, err - } else if parsed, err := url.ParseQuery(queryFrag); err != nil { - return nil, err - } else { - for k, v := range parsed { - for _, v2 := range v { - queryValues.Add(k, v2) + if queryFrag, err := runtime.StyleParamWithLocation("form", true, "consentStatus", runtime.ParamLocationQuery, *params.ConsentStatus); err != nil { + return nil, err + } else if parsed, err := url.ParseQuery(queryFrag); err != nil { + return nil, err + } else { + for k, v := range parsed { + for _, v2 := range v { + queryValues.Add(k, v2) + } } } + } + queryURL.RawQuery = queryValues.Encode() } - queryURL.RawQuery = queryValues.Encode() - req, err := http.NewRequest("GET", queryURL.String(), nil) if err != nil { return nil, err @@ -463,7 +465,7 @@ type ServerInterfaceWrapper struct { func (w *ServerInterfaceWrapper) GetRelationships(ctx echo.Context) error { var err error - ctx.Set(Harvester_authScopes, []string{""}) + ctx.Set(Harvester_authScopes, []string{}) // Parameter object where we will unmarshal all parameters from the context var params GetRelationshipsParams @@ -490,7 +492,7 @@ func (w *ServerInterfaceWrapper) PatchRelationship(ctx echo.Context) error { return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid format for parameter relationshipID: %s", err)) } - ctx.Set(Harvester_authScopes, []string{""}) + ctx.Set(Harvester_authScopes, []string{}) // Invoke the callback with all the unmarshalled arguments err = w.Handler.PatchRelationship(ctx, relationshipID) @@ -533,25 +535,25 @@ func RegisterHandlersWithBaseURL(router EchoRouter, si ServerInterface, baseURL // Base64 encoded, gzipped, json marshaled Swagger object var swaggerSpec = []string{ - "H4sIAAAAAAAC/8xWW2/bOBP9KwK/PupmO3Ebvfmrk9ZAthsk7csGXoOWRhK7EsWQo7hGoP++GMoXKXaa", - "y3aBfTItkjNnzjkk54HFVakqCRINix6YBqMqacD+mULK6wJpGFcSQdohV6oQMUdRyeC7qSR9M3EOJafR", - "Ow0pi9j/gn3coJ01wUSJc60rzZqmcVkCJtZCURwWMTvhTK5mzh4CrdrspdC77QQiSQTt5MWVrhRoFAQ5", - "5YUBl6nOJ4KeAP2mlS45sogJieMT5rKS/xBlXbLo9OzMZaWQ7b9BGLoM1wrapZCBZo3LSjCGZzYS/OCl", - "Kmh+4iyB1yjSunDAVrBd5u7zGdRCZm3CS5AZ5iwadpJs5qlaDXe10JCw6LbFvc87362vlt8hRsL0kXiS", - "eIMca1srSKrgljTS1T0kjGiWwg4UyITyzA8Su+yKY5xfQ2FVNblQ13BXg8FXU23xLMwO0M/s0Ed/WH4v", - "1rHyu4Bfi1QDR0gWHPuCDsPhwAsH3ij8Gn6IRmEUhn90tUw4goeihEdyDo6QKpLnGPj2bTallahrg4uk", - "KrmQC77YlP5K/g7CvDm/5CU8t/UrbZnaHV9o+eMoy19TxfKtVSzfWkWtkn/ZGY+MLuhwdvzYg3BM1GMU", - "PemhJ2U5dqAsk72qRyn/cJqOT7zT94P33snpeOgtR2nsDeOz8Sgdj3nKx10W6tqC6RAwGrtMcUTQdM3/", - "eRt6Z9xL5w8fGm83PnnBeDBs3rFDLumcybTavlE8trK12rNPAvN6SYzqgkUsR1QmCoLMfvbjqgw+w6oA", - "xCse/8V1EmS84IkWULCDB+rTdsr5zPU9GATt/MYlz6AEifblMgpikW7eRp+5rBAxSAMdRBPF4xycoR/2", - "UEVBsFqtfG5n/UpnwWarCS5nH8+/3Jx7Qz/0cywtMhRo1TmGiYB4zu8KJI1GNtE9aNNWMfBDfzCgGJUC", - "yZUgjf3QHzGrUm4vx0B3Llb7JQNLK92gdmKWUHbA695CCqF5CQjasOj2gQlKeVeDXjN3y0DcO+/uC1uH", - "x2/F3O23KsMwfFWbIhDKZx+o3vvS7LzHtebrYz3MTR3HYAw1AzumWiPt+qhj6XaFBNuGyzY+ENda4NoS", - "mW/lXfCaDtXtnBgwdVlyvWYRuxQGHczB6SlHFkSekRasr9ScMvRlDh66f2fThuAq6gsOlT9oFw6l7zMz", - "mzpVegCQua1DyHh7g/RhsO5libqGlzqmfRVao9he5v9Vsv5lreyTDdMRW3SXOW0742DlLMHZXPQHNTb/", - "0N0vN/V/ycSTOAaFwZQaVtMzirOR0PzM0Dadvt8asH/lF1XMi7wy6JsVzzLQvqgCrkRwP2KEYhP1sW8n", - "zs3V7OLi3LGNgtN2Cnur9r427uHuXhHCbE6A0kCXmZ2hc8G3WS4g2TDu9EyzBFwBSAdXVQ+J2UPp09HM", - "m78DAAD//4UFnZvaDQAA", + "H4sIAAAAAAAC/8xWW2/bOBP9KwK/PupmO3ETvfmr09ZAtxs07csGXoOWRhK7EsWQo7hGoP++GMoXyXaa", + "y3aBfRLFy8yZOYeceWBxVapKgkTDogemwahKGrA/U0h5XSAN40oiSDvkShUi5igqGXw3laQ5E+dQchq9", + "0ZCyiP0v2NsN2lUTTJS40rrSrGkalyVgYi0U2WERswvO5Hrm7CHQrs1ZMr07TiCSRNBJXlzrSoFGQZBT", + "XhhwmepMEfQE6JtWuuTIIiYkjs+Yy0r+Q5R1yaLzy0uXlUK2f4MwdBmuFbRbIQPNGpeVYAzPrCX4wUtV", + "0PrEWQKvUaR14YCNYLvN3fszqIXMWoefQGaYs2jYcbJZp2g13NVCQ8Ki2xb33u98t79afocYCdM7ypPE", + "G+RY21hBUgS3xJGu7iFhlGYp7ECBTMjP/Mixy645xvkXKCyrJhfqC9zVYPDFqbZ4FmYH6Gdy6KM/Dr9n", + "61T4XcAvRaqBIyQLjn1Ch+Fw4IUDbxR+DS+iURiF4R9dLhOO4KEo4YDOwYmkiuSpDHz7NpvSTtS1wUVS", + "lVzIBV9sQn9h/o7MvNq/5CU8dfQrHZnaE59p+6GV5a+JYvnaKJavjaJWyb+sjAOhC7qcHT32IJwi9VSK", + "HtXQo7SculCH6eglwNrxWzt+XJVPP3FnFyduhWWrZ3iU8ovzdHzmnb8dvPXOzsdDbzlKY28YX45H6XjM", + "Uz7uOqtrG3DH1WjsMsURQVMp+fM29C65l84fLhpvNz57xngwbN6wY77oLsu02tZBHltptPpiHwTm9ZJY", + "0wWLWI6oTBQEmZ2mPAUfYVUA4jWP/+I6CTJe8EQLKNhREfywXXI+cn0PBkE7v3HJMyhBoq2ORkEs0k39", + "9ZnLChGDNNBBNFE8zsEZ+mEPVRQEq9XK53bVr3QWbI6a4NPs3dXnmytv6Id+jqVFhgItO6cwERDP+V2B", + "pNHIOroHbdooBn7oDwZko1IguRLEsR/6I2ZZyu0DHOjO421nMrBppVfaLswS8g74pbeRTGheAoI2LLp9", + "YIJc3tWg18zdZiDuvSnuM9uTw3o0d/vt0DAMX9QKCYTyySLYq2HNTntca74+1Sfd1HEMxlDDsctUK6Rd", + "r3bK3S6QYNvU2eYK4loLXNtE5lt6F7ymS3U7pwyYuiy5XrOIfRIGHczB6TFHEkSeEResz9ScPPRpDh66", + "v7NpQ3AV9R7HzB+1JMfU9zMzmzpVegSQua1CSHh7gfRhsO6DjLqG5yqmrTytUGy/9P8qWf+ydvnRpuyE", + "LLrbnLZlcrByluBsislRjM0/VPfzRf1fEvEkjkFhMKWm2PSE4mwoND8TtHWn77cC7D/5RRXzIq8M+mbF", + "swy0L6qAKxHcjxih2Fg91O3EubmevX9/5djq67Tldy/V3mzjHp/uBSHM5gYoDfSY2RW6F3zr5T0km4w7", + "PdEsAVcA0sFV1UNi9lD66Wjmzd8BAAD//0kOZEY+DgAA", } // GetSwagger returns the content of the embedded swagger specification file diff --git a/pkg/server/api/admin/admin.gen.go b/pkg/server/api/admin/admin.gen.go index 898e6d5a..d2519bd4 100644 --- a/pkg/server/api/admin/admin.gen.go +++ b/pkg/server/api/admin/admin.gen.go @@ -1,6 +1,6 @@ // Package admin provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen version v1.12.4 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen version v1.13.0 DO NOT EDIT. package admin import ( @@ -306,42 +306,44 @@ func NewGetRelationshipsRequest(server string, params *GetRelationshipsParams) ( return nil, err } - queryValues := queryURL.Query() + if params != nil { + queryValues := queryURL.Query() - if params.Status != nil { + if params.Status != nil { - if queryFrag, err := runtime.StyleParamWithLocation("form", true, "status", runtime.ParamLocationQuery, *params.Status); err != nil { - return nil, err - } else if parsed, err := url.ParseQuery(queryFrag); err != nil { - return nil, err - } else { - for k, v := range parsed { - for _, v2 := range v { - queryValues.Add(k, v2) + if queryFrag, err := runtime.StyleParamWithLocation("form", true, "status", runtime.ParamLocationQuery, *params.Status); err != nil { + return nil, err + } else if parsed, err := url.ParseQuery(queryFrag); err != nil { + return nil, err + } else { + for k, v := range parsed { + for _, v2 := range v { + queryValues.Add(k, v2) + } } } - } - } - - if params.TrustDomainName != nil { + } - if queryFrag, err := runtime.StyleParamWithLocation("form", true, "trustDomainName", runtime.ParamLocationQuery, *params.TrustDomainName); err != nil { - return nil, err - } else if parsed, err := url.ParseQuery(queryFrag); err != nil { - return nil, err - } else { - for k, v := range parsed { - for _, v2 := range v { - queryValues.Add(k, v2) + if params.TrustDomainName != nil { + + if queryFrag, err := runtime.StyleParamWithLocation("form", true, "trustDomainName", runtime.ParamLocationQuery, *params.TrustDomainName); err != nil { + return nil, err + } else if parsed, err := url.ParseQuery(queryFrag); err != nil { + return nil, err + } else { + for k, v := range parsed { + for _, v2 := range v { + queryValues.Add(k, v2) + } } } + } + queryURL.RawQuery = queryValues.Encode() } - queryURL.RawQuery = queryValues.Encode() - req, err := http.NewRequest("GET", queryURL.String(), nil) if err != nil { return nil, err @@ -571,21 +573,23 @@ func NewGetJoinTokenRequest(server string, trustDomainName externalRef0.TrustDom return nil, err } - queryValues := queryURL.Query() + if params != nil { + queryValues := queryURL.Query() - if queryFrag, err := runtime.StyleParamWithLocation("form", true, "ttl", runtime.ParamLocationQuery, params.Ttl); err != nil { - return nil, err - } else if parsed, err := url.ParseQuery(queryFrag); err != nil { - return nil, err - } else { - for k, v := range parsed { - for _, v2 := range v { - queryValues.Add(k, v2) + if queryFrag, err := runtime.StyleParamWithLocation("form", true, "ttl", runtime.ParamLocationQuery, params.Ttl); err != nil { + return nil, err + } else if parsed, err := url.ParseQuery(queryFrag); err != nil { + return nil, err + } else { + for k, v := range parsed { + for _, v2 := range v { + queryValues.Add(k, v2) + } } } - } - queryURL.RawQuery = queryValues.Encode() + queryURL.RawQuery = queryValues.Encode() + } req, err := http.NewRequest("GET", queryURL.String(), nil) if err != nil { @@ -1332,32 +1336,39 @@ func RegisterHandlersWithBaseURL(router EchoRouter, si ServerInterface, baseURL // Base64 encoded, gzipped, json marshaled Swagger object var swaggerSpec = []string{ - "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", } // GetSwagger returns the content of the embedded swagger specification file diff --git a/pkg/server/api/harvester/harvester.gen.go b/pkg/server/api/harvester/harvester.gen.go index 46577081..c10a9454 100644 --- a/pkg/server/api/harvester/harvester.gen.go +++ b/pkg/server/api/harvester/harvester.gen.go @@ -1,6 +1,6 @@ // Package harvester provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen version v1.12.4 DO NOT EDIT. +// Code generated by github.com/deepmap/oapi-codegen version v1.13.0 DO NOT EDIT. package harvester import ( @@ -477,21 +477,23 @@ func NewOnboardRequest(server string, trustDomainName externalRef0.TrustDomainNa return nil, err } - queryValues := queryURL.Query() + if params != nil { + queryValues := queryURL.Query() - if queryFrag, err := runtime.StyleParamWithLocation("form", true, "joinToken", runtime.ParamLocationQuery, params.JoinToken); err != nil { - return nil, err - } else if parsed, err := url.ParseQuery(queryFrag); err != nil { - return nil, err - } else { - for k, v := range parsed { - for _, v2 := range v { - queryValues.Add(k, v2) + if queryFrag, err := runtime.StyleParamWithLocation("form", true, "joinToken", runtime.ParamLocationQuery, params.JoinToken); err != nil { + return nil, err + } else if parsed, err := url.ParseQuery(queryFrag); err != nil { + return nil, err + } else { + for k, v := range parsed { + for _, v2 := range v { + queryValues.Add(k, v2) + } } } - } - queryURL.RawQuery = queryValues.Encode() + queryURL.RawQuery = queryValues.Encode() + } req, err := http.NewRequest("GET", queryURL.String(), nil) if err != nil { @@ -527,26 +529,28 @@ func NewGetRelationshipsRequest(server string, trustDomainName externalRef0.Trus return nil, err } - queryValues := queryURL.Query() + if params != nil { + queryValues := queryURL.Query() - if params.ConsentStatus != nil { + if params.ConsentStatus != nil { - if queryFrag, err := runtime.StyleParamWithLocation("form", true, "consentStatus", runtime.ParamLocationQuery, *params.ConsentStatus); err != nil { - return nil, err - } else if parsed, err := url.ParseQuery(queryFrag); err != nil { - return nil, err - } else { - for k, v := range parsed { - for _, v2 := range v { - queryValues.Add(k, v2) + if queryFrag, err := runtime.StyleParamWithLocation("form", true, "consentStatus", runtime.ParamLocationQuery, *params.ConsentStatus); err != nil { + return nil, err + } else if parsed, err := url.ParseQuery(queryFrag); err != nil { + return nil, err + } else { + for k, v := range parsed { + for _, v2 := range v { + queryValues.Add(k, v2) + } } } + } + queryURL.RawQuery = queryValues.Encode() } - queryURL.RawQuery = queryValues.Encode() - req, err := http.NewRequest("GET", queryURL.String(), nil) if err != nil { return nil, err @@ -1121,7 +1125,7 @@ func (w *ServerInterfaceWrapper) BundlePut(ctx echo.Context) error { return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid format for parameter trustDomainName: %s", err)) } - ctx.Set(Harvester_authScopes, []string{""}) + ctx.Set(Harvester_authScopes, []string{}) // Invoke the callback with all the unmarshalled arguments err = w.Handler.BundlePut(ctx, trustDomainName) @@ -1139,7 +1143,7 @@ func (w *ServerInterfaceWrapper) BundleSync(ctx echo.Context) error { return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid format for parameter trustDomainName: %s", err)) } - ctx.Set(Harvester_authScopes, []string{""}) + ctx.Set(Harvester_authScopes, []string{}) // Invoke the callback with all the unmarshalled arguments err = w.Handler.BundleSync(ctx, trustDomainName) @@ -1157,7 +1161,7 @@ func (w *ServerInterfaceWrapper) GetNewJWTToken(ctx echo.Context) error { return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid format for parameter trustDomainName: %s", err)) } - ctx.Set(Harvester_authScopes, []string{""}) + ctx.Set(Harvester_authScopes, []string{}) // Invoke the callback with all the unmarshalled arguments err = w.Handler.GetNewJWTToken(ctx, trustDomainName) @@ -1200,7 +1204,7 @@ func (w *ServerInterfaceWrapper) GetRelationships(ctx echo.Context) error { return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid format for parameter trustDomainName: %s", err)) } - ctx.Set(Harvester_authScopes, []string{""}) + ctx.Set(Harvester_authScopes, []string{}) // Parameter object where we will unmarshal all parameters from the context var params GetRelationshipsParams @@ -1235,7 +1239,7 @@ func (w *ServerInterfaceWrapper) PatchRelationship(ctx echo.Context) error { return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid format for parameter relationshipID: %s", err)) } - ctx.Set(Harvester_authScopes, []string{""}) + ctx.Set(Harvester_authScopes, []string{}) // Invoke the callback with all the unmarshalled arguments err = w.Handler.PatchRelationship(ctx, trustDomainName, relationshipID) diff --git a/versions.mk b/versions.mk index a5aa2aba..3875220e 100644 --- a/versions.mk +++ b/versions.mk @@ -1,3 +1,3 @@ GO_VERSION := $(shell cat .go-version) SQLC_VERSION := 1.18.0 -OAPI_CODEGEN_VERSION := 1.12.4 +OAPI_CODEGEN_VERSION := 1.13.0