From 2a9b38ed5984c9dde690ced2fc1715bf43592343 Mon Sep 17 00:00:00 2001 From: Daniel Adam Date: Tue, 6 Aug 2024 12:18:10 +0200 Subject: [PATCH] Upgrade dependencies Submodule: github.com/googleapis/googleapis d4acb64370d333024a167551e7da854506109ba2 Direct: github.com/grpc-ecosystem/grpc-gateway/v2 v2.21.0 github.com/lestrrat-go/jwx/v2 v2.1.1 github.com/plgd-dev/device/v2 v2.5.3-0.20240805143631-9644c22de141 github.com/plgd-dev/go-coap/v3 v3.3.5-0.20240805141850-12858340a4f3 github.com/plgd-dev/hub/v2 v2.22.1-0.20240806063421-ca707fac297c google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 Indirect: github.com/go-co-op/gocron/v2 v2.11.0 github.com/lestrrat-go/httprc v1.0.6 github.com/pion/transport/v3 v3.0.7 github.com/tidwall/gjson v1.17.3 github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo v0.53.0 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 golang.org/x/crypto v0.25.0 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 golang.org/x/mod v0.19.0 golang.org/x/net v0.27.0 golang.org/x/oauth2 v0.22.0 golang.org/x/sync v0.8.0 golang.org/x/sys v0.23.0 golang.org/x/term v0.22.0 golang.org/x/tools v0.23.0 google.golang.org/genproto/googleapis/api v0.0.0-20240805194559-2c9e96a0b5d4 google.golang.org/genproto/googleapis/rpc v0.0.0-20240805194559-2c9e96a0b5d4 --- dependency/googleapis | 2 +- go.mod | 50 ++-- go.sum | 94 ++++---- pb/clear_cache.pb.go | 10 +- pb/create_resource.pb.go | 8 +- pb/delete_resource.pb.go | 8 +- pb/disown_device.pb.go | 10 +- pb/get_configuration.go | 9 +- pb/get_configuration.pb.go | 230 +++++++++--------- pb/get_configuration.proto | 128 +++++----- pb/get_device.pb.go | 8 +- pb/get_device_resource_links.pb.go | 8 +- pb/get_devices.pb.go | 8 +- pb/get_identity_certificate.pb.go | 10 +- pb/get_json_web_keys.pb.go | 8 +- pb/get_resource.pb.go | 8 +- pb/initialize.pb.go | 20 +- pb/offboard_device.pb.go | 10 +- pb/onboard_device.pb.go | 10 +- pb/own_device.pb.go | 14 +- pb/reset.pb.go | 10 +- pb/service.pb.gw.go | 113 ++------- pb/service.swagger.json | 244 ++++++++++++-------- pb/service_grpc.pb.go | 128 +++++----- pb/update_resource.pb.go | 8 +- service/config/remoteProvisioning/config.go | 6 +- service/grpc/device.go | 4 +- service/grpc/getDevices.go | 6 +- service/grpc/getResource.go | 4 +- test/test.go | 4 +- 30 files changed, 594 insertions(+), 586 deletions(-) diff --git a/dependency/googleapis b/dependency/googleapis index c23223d2..d4acb643 160000 --- a/dependency/googleapis +++ b/dependency/googleapis @@ -1 +1 @@ -Subproject commit c23223d273469bc9c0f296856b47d22fa1dfe3d9 +Subproject commit d4acb64370d333024a167551e7da854506109ba2 diff --git a/go.mod b/go.mod index 521bbb6f..4c370ec1 100644 --- a/go.mod +++ b/go.mod @@ -14,22 +14,22 @@ require ( github.com/goreleaser/goreleaser/v2 v2.0.1 github.com/gorilla/handlers v1.5.2 github.com/gorilla/mux v1.8.1 - github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.21.0 github.com/hashicorp/go-multierror v1.1.1 github.com/jellydator/ttlcache/v3 v3.2.0 github.com/jessevdk/go-flags v1.6.1 - github.com/lestrrat-go/jwx/v2 v2.1.0 + github.com/lestrrat-go/jwx/v2 v2.1.1 github.com/pion/dtls/v2 v2.2.8-0.20240701035148-45e16a098c47 - github.com/plgd-dev/device/v2 v2.5.2-0.20240702123445-f895dc844003 - github.com/plgd-dev/go-coap/v3 v3.3.5-0.20240702113249-de76143e11ea - github.com/plgd-dev/hub/v2 v2.20.1-0.20240702133409-6fcf2db85f31 + github.com/plgd-dev/device/v2 v2.5.3-0.20240805143631-9644c22de141 + github.com/plgd-dev/go-coap/v3 v3.3.5-0.20240805141850-12858340a4f3 + github.com/plgd-dev/hub/v2 v2.22.1-0.20240806063421-ca707fac297c github.com/plgd-dev/kit/v2 v2.0.0-20211006190727-057b33161b90 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/otel/trace v1.28.0 go.uber.org/atomic v1.11.0 go.uber.org/zap v1.27.0 google.golang.org/grpc v1.65.0 - google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.4.0 + google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 google.golang.org/protobuf v1.34.2 gopkg.in/yaml.v3 v3.0.1 ) @@ -149,7 +149,7 @@ require ( github.com/fxamacker/cbor/v2 v2.7.0 // indirect github.com/gabriel-vasile/mimetype v1.4.2 // indirect github.com/github/smimesign v0.2.0 // indirect - github.com/go-co-op/gocron/v2 v2.7.1 // indirect + github.com/go-co-op/gocron/v2 v2.11.0 // indirect github.com/go-fed/httpsig v1.1.0 // indirect github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect github.com/go-git/go-billy/v5 v5.5.0 // indirect @@ -232,7 +232,7 @@ require ( github.com/kylelemons/godebug v1.1.0 // indirect github.com/lestrrat-go/blackmagic v1.0.2 // indirect github.com/lestrrat-go/httpcc v1.0.1 // indirect - github.com/lestrrat-go/httprc v1.0.5 // indirect + github.com/lestrrat-go/httprc v1.0.6 // indirect github.com/lestrrat-go/iter v1.0.2 // indirect github.com/lestrrat-go/option v1.0.1 // indirect github.com/letsencrypt/boulder v0.0.0-20231026200631-000cd05d5491 // indirect @@ -277,7 +277,7 @@ require ( github.com/pelletier/go-toml v1.9.5 // indirect github.com/pelletier/go-toml/v2 v2.1.0 // indirect github.com/pion/logging v0.2.2 // indirect - github.com/pion/transport/v3 v3.0.2 // indirect + github.com/pion/transport/v3 v3.0.7 // indirect github.com/pjbgf/sha1cd v0.3.0 // indirect github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect github.com/pkg/errors v0.9.1 // indirect @@ -307,7 +307,7 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.18.2 // indirect github.com/subosito/gotenv v1.6.0 // indirect - github.com/tidwall/gjson v1.17.1 // indirect + github.com/tidwall/gjson v1.17.3 // indirect github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.1 // indirect github.com/tidwall/sjson v1.2.5 // indirect @@ -328,13 +328,13 @@ require ( github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.2 // indirect github.com/xdg-go/stringprep v1.0.4 // indirect - github.com/youmark/pkcs8 v0.0.0-20240424034433-3c2c7870ae76 // indirect + github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect gitlab.com/digitalxero/go-conventional-commit v1.0.7 // indirect go.mongodb.org/mongo-driver v1.16.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo v0.52.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect + go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo v0.53.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect @@ -344,22 +344,22 @@ require ( go.uber.org/automaxprocs v1.5.3 // indirect go.uber.org/multierr v1.11.0 // indirect gocloud.dev v0.37.0 // indirect - golang.org/x/crypto v0.24.0 // indirect - golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect - golang.org/x/mod v0.18.0 // indirect - golang.org/x/net v0.26.0 // indirect - golang.org/x/oauth2 v0.21.0 // indirect - golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.21.0 // indirect - golang.org/x/term v0.21.0 // indirect + golang.org/x/crypto v0.25.0 // indirect + golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect + golang.org/x/mod v0.19.0 // indirect + golang.org/x/net v0.27.0 // indirect + golang.org/x/oauth2 v0.22.0 // indirect + golang.org/x/sync v0.8.0 // indirect + golang.org/x/sys v0.23.0 // indirect + golang.org/x/term v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect golang.org/x/time v0.5.0 // indirect - golang.org/x/tools v0.22.0 // indirect + golang.org/x/tools v0.23.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect google.golang.org/api v0.172.0 // indirect google.golang.org/genproto v0.0.0-20240311173647-c811ad7063a7 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240805194559-2c9e96a0b5d4 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240805194559-2c9e96a0b5d4 // indirect gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/go.sum b/go.sum index 62d5f124..c61f37f0 100644 --- a/go.sum +++ b/go.sum @@ -331,8 +331,8 @@ github.com/glendc/go-external-ip v0.1.0/go.mod h1:CNx312s2FLAJoWNdJWZ2Fpf5O4oLsM github.com/gliderlabs/ssh v0.3.7 h1:iV3Bqi942d9huXnzEF2Mt+CY9gLu8DNM4Obd+8bODRE= github.com/gliderlabs/ssh v0.3.7/go.mod h1:zpHEXBstFnQYtGnB8k8kQLol82umzn/2/snG7alWVD8= github.com/go-acme/lego v2.7.2+incompatible/go.mod h1:yzMNe9CasVUhkquNvti5nAtPmG94USbYxYrZfTkIn0M= -github.com/go-co-op/gocron/v2 v2.7.1 h1:HNHT5WERT4LVzMIqcaQIVrMpNpL6ROK8DiSnATLDxb4= -github.com/go-co-op/gocron/v2 v2.7.1/go.mod h1:xY7bJxGazKam1cz04EebrlP4S9q4iWdiAylMGP3jY9w= +github.com/go-co-op/gocron/v2 v2.11.0 h1:IOowNA6SzwdRFnD4/Ol3Kj6G2xKfsoiiGq2Jhhm9bvE= +github.com/go-co-op/gocron/v2 v2.11.0/go.mod h1:xY7bJxGazKam1cz04EebrlP4S9q4iWdiAylMGP3jY9w= github.com/go-fed/httpsig v1.1.0 h1:9M+hb0jkEICD8/cAiNqEB66R87tTINszBRTjwjQzWcI= github.com/go-fed/httpsig v1.1.0/go.mod h1:RCMrTZvN1bJYtofsG4rd5NaO5obxQ5xBkdiS7xsT7bM= github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI= @@ -499,8 +499,8 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDa github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 h1:pRhl55Yx1eC7BZ1N+BBWwnKaMyD8uC+34TLdndZMAKk= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0/go.mod h1:XKMd7iuf/RGPSMJ/U4HP0zS2Z9Fh8Ps9a+6X26m/tmI= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.21.0 h1:CWyXh/jylQWp2dtiV33mY4iSSp6yf4lmn+c7/tN+ObI= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.21.0/go.mod h1:nCLIt0w3Ept2NwF8ThLmrppXsfT07oC8k0XNDxd8sVU= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -627,14 +627,14 @@ github.com/lestrrat-go/blackmagic v1.0.2 h1:Cg2gVSc9h7sz9NOByczrbUvLopQmXrfFx//N github.com/lestrrat-go/blackmagic v1.0.2/go.mod h1:UrEqBzIR2U6CnzVyUtfM6oZNMt/7O7Vohk2J0OGSAtU= github.com/lestrrat-go/httpcc v1.0.1 h1:ydWCStUeJLkpYyjLDHihupbn2tYmZ7m22BGkcvZZrIE= github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E= -github.com/lestrrat-go/httprc v1.0.5 h1:bsTfiH8xaKOJPrg1R+E3iE/AWZr/x0Phj9PBTG/OLUk= -github.com/lestrrat-go/httprc v1.0.5/go.mod h1:mwwz3JMTPBjHUkkDv/IGJ39aALInZLrhBp0X7KGUZlo= +github.com/lestrrat-go/httprc v1.0.6 h1:qgmgIRhpvBqexMJjA/PmwSvhNk679oqD1RbovdCGW8k= +github.com/lestrrat-go/httprc v1.0.6/go.mod h1:mwwz3JMTPBjHUkkDv/IGJ39aALInZLrhBp0X7KGUZlo= github.com/lestrrat-go/iter v0.0.0-20200422075355-fc1769541911/go.mod h1:zIdgO1mRKhn8l9vrZJZz9TUMMFbQbLeTsbqPDrJ/OJc= github.com/lestrrat-go/iter v1.0.2 h1:gMXo1q4c2pHmC3dn8LzRhJfP1ceCbgSiT9lUydIzltI= github.com/lestrrat-go/iter v1.0.2/go.mod h1:Momfcq3AnRlRjI5b5O8/G5/BvpzrhoFTZcn06fEOPt4= github.com/lestrrat-go/jwx v1.0.2/go.mod h1:TPF17WiSFegZo+c20fdpw49QD+/7n4/IsGvEmCSWwT0= -github.com/lestrrat-go/jwx/v2 v2.1.0 h1:0zs7Ya6+39qoit7gwAf+cYm1zzgS3fceIdo7RmQ5lkw= -github.com/lestrrat-go/jwx/v2 v2.1.0/go.mod h1:Xpw9QIaUGiIUD1Wx0NcY1sIHwFf8lDuZn/cmxtXYRys= +github.com/lestrrat-go/jwx/v2 v2.1.1 h1:Y2ltVl8J6izLYFs54BVcpXLv5msSW4o8eXwnzZLI32E= +github.com/lestrrat-go/jwx/v2 v2.1.1/go.mod h1:4LvZg7oxu6Q5VJwn7Mk/UwooNRnTHUpXBj2C4j3HNx0= github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU= github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= github.com/lestrrat-go/pdebug v0.0.0-20200204225717-4d6bd78da58d/go.mod h1:B06CSso/AWxiPejj+fheUINGeBKeeEZNt8w+EoU7+L8= @@ -763,8 +763,9 @@ github.com/pion/dtls/v2 v2.2.8-0.20240701035148-45e16a098c47 h1:WCUn5hJZLLMoOved github.com/pion/dtls/v2 v2.2.8-0.20240701035148-45e16a098c47/go.mod h1:8eXNLDNOiXaHvo/wOFnFcr/yinEimCDUQ512tlOSvPo= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= -github.com/pion/transport/v3 v3.0.2 h1:r+40RJR25S9w3jbA6/5uEPTzcdn7ncyU44RWCbHkLg4= github.com/pion/transport/v3 v3.0.2/go.mod h1:nIToODoOlb5If2jF9y2Igfx3PFYWfuXi37m0IlWa/D0= +github.com/pion/transport/v3 v3.0.7 h1:iRbMH05BzSNwhILHoBoAPxoB9xQgOaJk+591KC9P1o0= +github.com/pion/transport/v3 v3.0.7/go.mod h1:YleKiTZ4vqNxVwh77Z0zytYi7rXHl7j6uPLGhhz9rwo= github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4= github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI= github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ= @@ -774,14 +775,14 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/profile v1.7.0 h1:hnbDkaNWPCLMO9wGLdBFTIZvzDrDfBM2072E1S9gJkA= github.com/pkg/profile v1.7.0/go.mod h1:8Uer0jas47ZQMJ7VD+OHknK4YDY07LPUC6dEvqDjvNo= -github.com/plgd-dev/device/v2 v2.5.2-0.20240702123445-f895dc844003 h1:XxeYdKLkKYsELyM6PPogSFS/os5l9UNhMrQqhXl5ins= -github.com/plgd-dev/device/v2 v2.5.2-0.20240702123445-f895dc844003/go.mod h1:SQzNX4V6Y8Yodvn4Pt7t6la+mwwL1qBqvPkkWG5G5YQ= +github.com/plgd-dev/device/v2 v2.5.3-0.20240805143631-9644c22de141 h1:LjNyiLkFe85vzMhR+t5/fUyYMI8hJ87gAZPEZsWIlLg= +github.com/plgd-dev/device/v2 v2.5.3-0.20240805143631-9644c22de141/go.mod h1:tdwJCs/sIoK5dTx8pzbFaZAcY8c+L4qvN2odVNYDBIQ= github.com/plgd-dev/go-coap/v2 v2.0.4-0.20200819112225-8eb712b901bc/go.mod h1:+tCi9Q78H/orWRtpVWyBgrr4vKFo2zYtbbxUllerBp4= github.com/plgd-dev/go-coap/v2 v2.4.1-0.20210517130748-95c37ac8e1fa/go.mod h1:rA7fc7ar+B/qa+Q0hRqv7yj/EMtIlmo1l7vkQGSrHPU= -github.com/plgd-dev/go-coap/v3 v3.3.5-0.20240702113249-de76143e11ea h1:4Q8KcsN2S/bNkZzMoYDDtrd+LkDrQLLn8JoVQgDb9uw= -github.com/plgd-dev/go-coap/v3 v3.3.5-0.20240702113249-de76143e11ea/go.mod h1:wfmFEjYzNUWYwyntBLXKiuNeStJ5XFdGvAeXdXPm2ZI= -github.com/plgd-dev/hub/v2 v2.20.1-0.20240702133409-6fcf2db85f31 h1:ii5PmTJxAGwG0Y1ZNP0YdMid6rslu69jcdW26be5yHE= -github.com/plgd-dev/hub/v2 v2.20.1-0.20240702133409-6fcf2db85f31/go.mod h1:Y5YJUy8RTBrSUe8Wri+Gmc1Fcsc2tbNVSGi4zLgaXLM= +github.com/plgd-dev/go-coap/v3 v3.3.5-0.20240805141850-12858340a4f3 h1:Z7GisFwDE0TWTHvYUxmiLxpdi1SEHo+bM40v6fzEbmY= +github.com/plgd-dev/go-coap/v3 v3.3.5-0.20240805141850-12858340a4f3/go.mod h1:TI0gTsUI7If7KuvUjBCWvrZ5RAi9lh/HCm4oiKq2QTY= +github.com/plgd-dev/hub/v2 v2.22.1-0.20240806063421-ca707fac297c h1:cY3SxGyKg0Emp72u/TmJIzXDhpFCSMggv0W4fSTOkOQ= +github.com/plgd-dev/hub/v2 v2.22.1-0.20240806063421-ca707fac297c/go.mod h1:j8BT5NLPpydpsqrG27rcC9jWOLEaLXqiXEhyB6QA5Mo= github.com/plgd-dev/kit v0.0.0-20200819113605-d5fcf3e94f63/go.mod h1:Yl9zisyXfPdtP9hTWlJqjJYXmgU/jtSDKttz9/CeD90= github.com/plgd-dev/kit/v2 v2.0.0-20211006190727-057b33161b90 h1:TC1HJ/UbyflJFPvaOdGmNZ5TeFGex1/dyr9urNGLy7M= github.com/plgd-dev/kit/v2 v2.0.0-20211006190727-057b33161b90/go.mod h1:Z7oKFLSGQjdi8eInxwFCs0tSApuEM1o0qNck+sJYp4M= @@ -892,8 +893,8 @@ github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= -github.com/tidwall/gjson v1.17.1 h1:wlYEnwqAHgzmhNUFfw7Xalt2JzQvsMx2Se4PcoFCT/U= -github.com/tidwall/gjson v1.17.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= +github.com/tidwall/gjson v1.17.3 h1:bwWLZU7icoKRG+C+0PNwIKC6FCJO/Q3p2pZvuP0jN94= +github.com/tidwall/gjson v1.17.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= @@ -958,8 +959,8 @@ github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo= github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos= -github.com/youmark/pkcs8 v0.0.0-20240424034433-3c2c7870ae76 h1:tBiBTKHnIjovYoLX/TPkcf+OjqqKGQrPtGT3Foz+Pgo= -github.com/youmark/pkcs8 v0.0.0-20240424034433-3c2c7870ae76/go.mod h1:SQliXeA7Dhkt//vS29v3zpbEwoa+zb2Cn5xj5uO4K5U= +github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM= +github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= @@ -970,12 +971,12 @@ go.mongodb.org/mongo-driver v1.16.0 h1:tpRsfBJMROVHKpdGyc1BBEzzjDUWjItxbVSZ8Ls4B go.mongodb.org/mongo-driver v1.16.0/go.mod h1:oB6AhJQvFQL4LEHyXi6aJzQJtBiTQHiAd83l0GdFaiw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo v0.52.0 h1:OlF/Imldgj1AMRL0W18Fx+bckgHbkJb1M3/m9HdF84g= -go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo v0.52.0/go.mod h1:VMFHHABIjcnnc2tOWQbgSZiSIMclBbaZ8rHexaAOljA= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 h1:vS1Ao/R55RNV4O7TA2Qopok8yN+X0LIP6RVWLFkprck= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0/go.mod h1:BMsdeOxN04K0L5FNUBfjFdvwWGNe/rkmSwH4Aelu/X0= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4ba9kHbBol3Xin3leYJ+252h0zszDtBwyKe2A= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0/go.mod h1:XLZfZboOJWHNKUv7eH0inh0E9VV6eWDFB/9yJyTLPp0= +go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo v0.53.0 h1:/g+er1+hOsTE7iGcq5dnjfbYEiIbbRABm1rTvp5EsE0= +go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo v0.53.0/go.mod h1:RHcOHuTeWbvM5a/FElwi/kavuik1RFoSRKcSnIybFlE= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 h1:9G6E0TXzGFVfTnawRzrPl83iHOAV7L8NJiR8RSGYV1g= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0/go.mod h1:azvtTADFQJA8mX80jIH/akaE7h+dbm/sVuaHqN13w74= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9ROb4G8qkH90LXEIICcs5zv1OYY= @@ -1039,11 +1040,12 @@ golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1m golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= -golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= +golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= +golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY= -golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= @@ -1059,8 +1061,8 @@ golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= -golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8= +golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1091,12 +1093,13 @@ golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= -golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= -golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA= +golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1108,8 +1111,9 @@ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1145,8 +1149,9 @@ golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= +golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -1159,8 +1164,9 @@ golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= -golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA= golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= +golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk= +golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -1201,8 +1207,8 @@ golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= -golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA= -golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= +golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg= +golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1220,10 +1226,10 @@ google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20240311173647-c811ad7063a7 h1:ImUcDPHjTrAqNhlOkSocDLfG9rrNHH7w7uoKWPaWZ8s= google.golang.org/genproto v0.0.0-20240311173647-c811ad7063a7/go.mod h1:/3XmxOjePkvmKrHuBy4zNFw7IzxJXtAgdpXi8Ll990U= -google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= -google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto/googleapis/api v0.0.0-20240805194559-2c9e96a0b5d4 h1:ABEBT/sZ7We8zd7A5f3KO6zMQe+s3901H7l8Whhijt0= +google.golang.org/genproto/googleapis/api v0.0.0-20240805194559-2c9e96a0b5d4/go.mod h1:4+X6GvPs+25wZKbQq9qyAXrwIRExv7w0Ea6MgZLZiDM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240805194559-2c9e96a0b5d4 h1:OsSGQeIIsyOEOimVxLEIL4rwGcnrjOydQaiA2bOnZUM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240805194559-2c9e96a0b5d4/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= @@ -1233,8 +1239,8 @@ google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.4.0 h1:9SxA29VM43MF5Z9dQu694wmY5t8E/Gxr7s+RSxiIDmc= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.4.0/go.mod h1:yZOK5zhQMiALmuweVdIVoQPa6eIJyXn2B9g5dJDhqX4= +google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 h1:F29+wU6Ee6qgu9TddPgooOdaqsxTMunOoj8KA5yuS5A= +google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1/go.mod h1:5KF+wpkbTSbGcR9zteSqZV6fqFOWBl4Yde8En8MryZA= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/pb/clear_cache.pb.go b/pb/clear_cache.pb.go index beea3ab6..78309cfc 100644 --- a/pb/clear_cache.pb.go +++ b/pb/clear_cache.pb.go @@ -16,8 +16,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v4.25.1 +// protoc-gen-go v1.34.2 +// protoc v5.27.3 // source: github.com/plgd-dev/client-application/pb/clear_cache.proto package pb @@ -141,7 +141,7 @@ func file_github_com_plgd_dev_client_application_pb_clear_cache_proto_rawDescGZI } var file_github_com_plgd_dev_client_application_pb_clear_cache_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_github_com_plgd_dev_client_application_pb_clear_cache_proto_goTypes = []interface{}{ +var file_github_com_plgd_dev_client_application_pb_clear_cache_proto_goTypes = []any{ (*ClearCacheRequest)(nil), // 0: service.pb.ClearCacheRequest (*ClearCacheResponse)(nil), // 1: service.pb.ClearCacheResponse } @@ -159,7 +159,7 @@ func file_github_com_plgd_dev_client_application_pb_clear_cache_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_github_com_plgd_dev_client_application_pb_clear_cache_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_clear_cache_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ClearCacheRequest); i { case 0: return &v.state @@ -171,7 +171,7 @@ func file_github_com_plgd_dev_client_application_pb_clear_cache_proto_init() { return nil } } - file_github_com_plgd_dev_client_application_pb_clear_cache_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_clear_cache_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*ClearCacheResponse); i { case 0: return &v.state diff --git a/pb/create_resource.pb.go b/pb/create_resource.pb.go index 38fc961c..791fea42 100644 --- a/pb/create_resource.pb.go +++ b/pb/create_resource.pb.go @@ -16,8 +16,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v4.25.1 +// protoc-gen-go v1.34.2 +// protoc v5.27.3 // source: github.com/plgd-dev/client-application/pb/create_resource.proto package pb @@ -133,7 +133,7 @@ func file_github_com_plgd_dev_client_application_pb_create_resource_proto_rawDes } var file_github_com_plgd_dev_client_application_pb_create_resource_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_plgd_dev_client_application_pb_create_resource_proto_goTypes = []interface{}{ +var file_github_com_plgd_dev_client_application_pb_create_resource_proto_goTypes = []any{ (*CreateResourceRequest)(nil), // 0: service.pb.CreateResourceRequest (*commands.ResourceId)(nil), // 1: resourceaggregate.pb.ResourceId (*pb.Content)(nil), // 2: grpcgateway.pb.Content @@ -154,7 +154,7 @@ func file_github_com_plgd_dev_client_application_pb_create_resource_proto_init() return } if !protoimpl.UnsafeEnabled { - file_github_com_plgd_dev_client_application_pb_create_resource_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_create_resource_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*CreateResourceRequest); i { case 0: return &v.state diff --git a/pb/delete_resource.pb.go b/pb/delete_resource.pb.go index 3f30f61a..c15e817e 100644 --- a/pb/delete_resource.pb.go +++ b/pb/delete_resource.pb.go @@ -16,8 +16,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v4.25.1 +// protoc-gen-go v1.34.2 +// protoc v5.27.3 // source: github.com/plgd-dev/client-application/pb/delete_resource.proto package pb @@ -119,7 +119,7 @@ func file_github_com_plgd_dev_client_application_pb_delete_resource_proto_rawDes } var file_github_com_plgd_dev_client_application_pb_delete_resource_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_plgd_dev_client_application_pb_delete_resource_proto_goTypes = []interface{}{ +var file_github_com_plgd_dev_client_application_pb_delete_resource_proto_goTypes = []any{ (*DeleteResourceRequest)(nil), // 0: service.pb.DeleteResourceRequest (*commands.ResourceId)(nil), // 1: resourceaggregate.pb.ResourceId } @@ -138,7 +138,7 @@ func file_github_com_plgd_dev_client_application_pb_delete_resource_proto_init() return } if !protoimpl.UnsafeEnabled { - file_github_com_plgd_dev_client_application_pb_delete_resource_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_delete_resource_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*DeleteResourceRequest); i { case 0: return &v.state diff --git a/pb/disown_device.pb.go b/pb/disown_device.pb.go index 5055d9bd..3548ede0 100644 --- a/pb/disown_device.pb.go +++ b/pb/disown_device.pb.go @@ -16,8 +16,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v4.25.1 +// protoc-gen-go v1.34.2 +// protoc v5.27.3 // source: github.com/plgd-dev/client-application/pb/disown_device.proto package pb @@ -152,7 +152,7 @@ func file_github_com_plgd_dev_client_application_pb_disown_device_proto_rawDescG } var file_github_com_plgd_dev_client_application_pb_disown_device_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_github_com_plgd_dev_client_application_pb_disown_device_proto_goTypes = []interface{}{ +var file_github_com_plgd_dev_client_application_pb_disown_device_proto_goTypes = []any{ (*DisownDeviceRequest)(nil), // 0: service.pb.DisownDeviceRequest (*DisownDeviceResponse)(nil), // 1: service.pb.DisownDeviceResponse } @@ -170,7 +170,7 @@ func file_github_com_plgd_dev_client_application_pb_disown_device_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_github_com_plgd_dev_client_application_pb_disown_device_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_disown_device_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*DisownDeviceRequest); i { case 0: return &v.state @@ -182,7 +182,7 @@ func file_github_com_plgd_dev_client_application_pb_disown_device_proto_init() { return nil } } - file_github_com_plgd_dev_client_application_pb_disown_device_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_disown_device_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*DisownDeviceResponse); i { case 0: return &v.state diff --git a/pb/get_configuration.go b/pb/get_configuration.go index ac5c86c8..e38141fd 100644 --- a/pb/get_configuration.go +++ b/pb/get_configuration.go @@ -20,16 +20,11 @@ import ( "os" "time" - pb "github.com/plgd-dev/hub/v2/grpc-gateway/pb" + "github.com/plgd-dev/hub/v2/grpc-gateway/pb" "github.com/plgd-dev/kit/v2/security" "gopkg.in/yaml.v3" ) -type ( - WebOauthClient = pb.WebOAuthClient - DeviceOauthClient = pb.DeviceOAuthClient -) - func (c *UserAgent) Clone() *UserAgent { if c == nil { return nil @@ -108,7 +103,7 @@ func (r *GetConfigurationResponse) Clone() *GetConfigurationResponse { } } -func ValidateWebOAuthClient(c *pb.WebOAuthClient) error { +func ValidateWebOAuthClient(c *pb.OAuthClient) error { if c.GetClientId() == "" { return fmt.Errorf("clientID('%v')", c.GetClientId()) } diff --git a/pb/get_configuration.pb.go b/pb/get_configuration.pb.go index 8f956b0a..3356fa2b 100644 --- a/pb/get_configuration.pb.go +++ b/pb/get_configuration.pb.go @@ -16,8 +16,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v4.25.1 +// protoc-gen-go v1.34.2 +// protoc v5.27.3 // source: github.com/plgd-dev/client-application/pb/get_configuration.proto package pb @@ -237,8 +237,9 @@ type RemoteProvisioning struct { CertificateAuthority string `protobuf:"bytes,9,opt,name=certificate_authority,json=certificateAuthority,proto3" json:"certificate_authority,omitempty" yaml:"certificateAuthority"` // @gotags: yaml:"certificateAuthority" // http-gateway in format https://host:port // string http_gateway_address = 10; // @gotags: yaml:"-" - WebOauthClient *pb.WebOAuthClient `protobuf:"bytes,11,opt,name=web_oauth_client,json=webOauthClient,proto3" json:"web_oauth_client,omitempty" yaml:"webOAuthClient"` // @gotags: yaml:"webOAuthClient" - DeviceOauthClient *pb.DeviceOAuthClient `protobuf:"bytes,12,opt,name=device_oauth_client,json=deviceOauthClient,proto3" json:"device_oauth_client,omitempty" yaml:"deviceOAuthClient"` // @gotags: yaml:"deviceOAuthClient" + WebOauthClient *pb.OAuthClient `protobuf:"bytes,11,opt,name=web_oauth_client,json=webOauthClient,proto3" json:"web_oauth_client,omitempty" yaml:"webOAuthClient"` // @gotags: yaml:"webOAuthClient" + DeviceOauthClient *pb.OAuthClient `protobuf:"bytes,12,opt,name=device_oauth_client,json=deviceOauthClient,proto3" json:"device_oauth_client,omitempty" yaml:"deviceOAuthClient"` // @gotags: yaml:"deviceOAuthClient" + M2MOauthClient *pb.OAuthClient `protobuf:"bytes,13,opt,name=m2m_oauth_client,json=m2mOauthClient,proto3" json:"m2m_oauth_client,omitempty" yaml:"m2mOAuthClient"` // @gotags: yaml:"m2mOAuthClient" Mode RemoteProvisioning_Mode `protobuf:"varint,100,opt,name=mode,proto3,enum=service.pb.RemoteProvisioning_Mode" json:"mode,omitempty" yaml:"mode"` // @gotags: yaml:"mode" UserAgent *UserAgent `protobuf:"bytes,101,opt,name=user_agent,json=userAgent,proto3" json:"user_agent,omitempty" yaml:"userAgent"` // @gotags: yaml:"userAgent" CaPool []string `protobuf:"bytes,102,rep,name=ca_pool,json=caPool,proto3" json:"ca_pool,omitempty" yaml:"caPool"` // @gotags: yaml:"caPool" @@ -325,20 +326,27 @@ func (x *RemoteProvisioning) GetCertificateAuthority() string { return "" } -func (x *RemoteProvisioning) GetWebOauthClient() *pb.WebOAuthClient { +func (x *RemoteProvisioning) GetWebOauthClient() *pb.OAuthClient { if x != nil { return x.WebOauthClient } return nil } -func (x *RemoteProvisioning) GetDeviceOauthClient() *pb.DeviceOAuthClient { +func (x *RemoteProvisioning) GetDeviceOauthClient() *pb.OAuthClient { if x != nil { return x.DeviceOauthClient } return nil } +func (x *RemoteProvisioning) GetM2MOauthClient() *pb.OAuthClient { + if x != nil { + return x.M2MOauthClient + } + return nil +} + func (x *RemoteProvisioning) GetMode() RemoteProvisioning_Mode { if x != nil { return x.Mode @@ -637,7 +645,7 @@ var file_github_com_plgd_dev_client_application_pb_get_configuration_proto_rawDe 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x1b, 0x63, 0x73, 0x72, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x45, 0x78, 0x70, 0x69, 0x72, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xfc, 0x04, 0x0a, 0x12, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x50, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xba, 0x05, 0x0a, 0x12, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x26, @@ -655,87 +663,91 @@ var file_github_com_plgd_dev_client_application_pb_get_configuration_proto_rawDe 0x12, 0x33, 0x0a, 0x15, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x14, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x41, 0x75, 0x74, 0x68, - 0x6f, 0x72, 0x69, 0x74, 0x79, 0x12, 0x48, 0x0a, 0x10, 0x77, 0x65, 0x62, 0x5f, 0x6f, 0x61, 0x75, + 0x6f, 0x72, 0x69, 0x74, 0x79, 0x12, 0x45, 0x0a, 0x10, 0x77, 0x65, 0x62, 0x5f, 0x6f, 0x61, 0x75, 0x74, 0x68, 0x5f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x1e, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x2e, 0x70, 0x62, - 0x2e, 0x57, 0x65, 0x62, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x52, - 0x0e, 0x77, 0x65, 0x62, 0x4f, 0x61, 0x75, 0x74, 0x68, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x12, - 0x51, 0x0a, 0x13, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x6f, 0x61, 0x75, 0x74, 0x68, 0x5f, - 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x67, - 0x72, 0x70, 0x63, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x65, - 0x76, 0x69, 0x63, 0x65, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x52, - 0x11, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x4f, 0x61, 0x75, 0x74, 0x68, 0x43, 0x6c, 0x69, 0x65, - 0x6e, 0x74, 0x12, 0x37, 0x0a, 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x64, 0x20, 0x01, 0x28, 0x0e, - 0x32, 0x23, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65, - 0x6d, 0x6f, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, - 0x2e, 0x4d, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x12, 0x34, 0x0a, 0x0a, 0x75, - 0x73, 0x65, 0x72, 0x5f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x18, 0x65, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x15, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, 0x62, 0x2e, 0x55, 0x73, 0x65, - 0x72, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x52, 0x09, 0x75, 0x73, 0x65, 0x72, 0x41, 0x67, 0x65, 0x6e, - 0x74, 0x12, 0x17, 0x0a, 0x07, 0x63, 0x61, 0x5f, 0x70, 0x6f, 0x6f, 0x6c, 0x18, 0x66, 0x20, 0x03, - 0x28, 0x09, 0x52, 0x06, 0x63, 0x61, 0x50, 0x6f, 0x6f, 0x6c, 0x22, 0x25, 0x0a, 0x04, 0x4d, 0x6f, - 0x64, 0x65, 0x12, 0x0d, 0x0a, 0x09, 0x4d, 0x4f, 0x44, 0x45, 0x5f, 0x4e, 0x4f, 0x4e, 0x45, 0x10, - 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x55, 0x53, 0x45, 0x52, 0x5f, 0x41, 0x47, 0x45, 0x4e, 0x54, 0x10, - 0x01, 0x4a, 0x04, 0x08, 0x03, 0x10, 0x04, 0x4a, 0x04, 0x08, 0x08, 0x10, 0x09, 0x4a, 0x04, 0x08, - 0x0a, 0x10, 0x0b, 0x22, 0xa7, 0x01, 0x0a, 0x09, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x6e, 0x66, - 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x1d, 0x0a, 0x0a, 0x62, - 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x64, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x09, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x44, 0x61, 0x74, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f, - 0x6d, 0x6d, 0x69, 0x74, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x48, 0x61, 0x73, 0x68, 0x12, 0x1f, 0x0a, 0x0b, 0x63, - 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x5f, 0x64, 0x61, 0x74, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x44, 0x61, 0x74, 0x65, 0x12, 0x1f, 0x0a, 0x0b, - 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0a, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x55, 0x72, 0x6c, 0x22, 0x4d, 0x0a, - 0x0f, 0x55, 0x49, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x12, 0x3a, 0x0a, 0x19, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x64, 0x69, 0x73, 0x63, - 0x6f, 0x76, 0x65, 0x72, 0x79, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x64, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x17, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x44, 0x69, 0x73, 0x63, - 0x6f, 0x76, 0x65, 0x72, 0x79, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x22, 0xf1, 0x04, 0x0a, - 0x18, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, - 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, - 0x69, 0x6f, 0x6e, 0x12, 0x1d, 0x0a, 0x0a, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x64, 0x61, 0x74, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x44, 0x61, - 0x74, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x5f, 0x68, 0x61, 0x73, - 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x48, - 0x61, 0x73, 0x68, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x5f, 0x64, 0x61, - 0x74, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, - 0x44, 0x61, 0x74, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x5f, - 0x75, 0x72, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x72, 0x65, 0x6c, 0x65, 0x61, - 0x73, 0x65, 0x55, 0x72, 0x6c, 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x73, 0x5f, 0x69, 0x6e, 0x69, 0x74, - 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x69, - 0x73, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x12, 0x7b, 0x0a, 0x1a, - 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0e, - 0x32, 0x3d, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, 0x62, 0x2e, 0x47, 0x65, - 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x41, 0x75, 0x74, - 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x6f, 0x64, 0x65, 0x52, - 0x18, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x41, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x4f, 0x0a, 0x13, 0x72, 0x65, 0x6d, - 0x6f, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, - 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x73, - 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x52, 0x12, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x50, 0x72, - 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x12, 0x14, 0x0a, 0x05, 0x6f, 0x77, - 0x6e, 0x65, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, - 0x12, 0x34, 0x0a, 0x0a, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x0a, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, - 0x62, 0x2e, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x62, 0x75, 0x69, - 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x2b, 0x0a, 0x02, 0x75, 0x69, 0x18, 0x0b, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, 0x62, 0x2e, - 0x55, 0x49, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, - 0x02, 0x75, 0x69, 0x22, 0x4b, 0x0a, 0x18, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x41, 0x75, 0x74, - 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x6f, 0x64, 0x65, 0x12, - 0x12, 0x0a, 0x0e, 0x50, 0x52, 0x45, 0x5f, 0x53, 0x48, 0x41, 0x52, 0x45, 0x44, 0x5f, 0x4b, 0x45, - 0x59, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x58, 0x35, 0x30, 0x39, 0x10, 0x01, 0x12, 0x11, 0x0a, - 0x0d, 0x55, 0x4e, 0x49, 0x4e, 0x49, 0x54, 0x49, 0x41, 0x4c, 0x49, 0x5a, 0x45, 0x44, 0x10, 0x02, - 0x42, 0x2e, 0x5a, 0x2c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, - 0x6c, 0x67, 0x64, 0x2d, 0x64, 0x65, 0x76, 0x2f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x2d, 0x61, - 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x70, 0x62, 0x3b, 0x70, 0x62, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x1b, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x2e, 0x70, 0x62, + 0x2e, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x0e, 0x77, 0x65, + 0x62, 0x4f, 0x61, 0x75, 0x74, 0x68, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x4b, 0x0a, 0x13, + 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x6f, 0x61, 0x75, 0x74, 0x68, 0x5f, 0x63, 0x6c, 0x69, + 0x65, 0x6e, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x67, 0x72, 0x70, 0x63, + 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x2e, 0x70, 0x62, 0x2e, 0x4f, 0x41, 0x75, 0x74, 0x68, + 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x11, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x4f, 0x61, + 0x75, 0x74, 0x68, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x45, 0x0a, 0x10, 0x6d, 0x32, 0x6d, + 0x5f, 0x6f, 0x61, 0x75, 0x74, 0x68, 0x5f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x18, 0x0d, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, + 0x79, 0x2e, 0x70, 0x62, 0x2e, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, + 0x52, 0x0e, 0x6d, 0x32, 0x6d, 0x4f, 0x61, 0x75, 0x74, 0x68, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, + 0x12, 0x37, 0x0a, 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x64, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x23, + 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65, 0x6d, 0x6f, + 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x4d, + 0x6f, 0x64, 0x65, 0x52, 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x12, 0x34, 0x0a, 0x0a, 0x75, 0x73, 0x65, + 0x72, 0x5f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x18, 0x65, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, 0x62, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, + 0x67, 0x65, 0x6e, 0x74, 0x52, 0x09, 0x75, 0x73, 0x65, 0x72, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x12, + 0x17, 0x0a, 0x07, 0x63, 0x61, 0x5f, 0x70, 0x6f, 0x6f, 0x6c, 0x18, 0x66, 0x20, 0x03, 0x28, 0x09, + 0x52, 0x06, 0x63, 0x61, 0x50, 0x6f, 0x6f, 0x6c, 0x22, 0x25, 0x0a, 0x04, 0x4d, 0x6f, 0x64, 0x65, + 0x12, 0x0d, 0x0a, 0x09, 0x4d, 0x4f, 0x44, 0x45, 0x5f, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x00, 0x12, + 0x0e, 0x0a, 0x0a, 0x55, 0x53, 0x45, 0x52, 0x5f, 0x41, 0x47, 0x45, 0x4e, 0x54, 0x10, 0x01, 0x4a, + 0x04, 0x08, 0x03, 0x10, 0x04, 0x4a, 0x04, 0x08, 0x08, 0x10, 0x09, 0x4a, 0x04, 0x08, 0x0a, 0x10, + 0x0b, 0x22, 0xa7, 0x01, 0x0a, 0x09, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, + 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x1d, 0x0a, 0x0a, 0x62, 0x75, 0x69, + 0x6c, 0x64, 0x5f, 0x64, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x62, + 0x75, 0x69, 0x6c, 0x64, 0x44, 0x61, 0x74, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f, 0x6d, 0x6d, + 0x69, 0x74, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, + 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x48, 0x61, 0x73, 0x68, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f, 0x6d, + 0x6d, 0x69, 0x74, 0x5f, 0x64, 0x61, 0x74, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, + 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x44, 0x61, 0x74, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x65, + 0x6c, 0x65, 0x61, 0x73, 0x65, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x0a, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x55, 0x72, 0x6c, 0x22, 0x4d, 0x0a, 0x0f, 0x55, + 0x49, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, + 0x0a, 0x19, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, + 0x65, 0x72, 0x79, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x64, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x17, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, + 0x65, 0x72, 0x79, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x22, 0xf1, 0x04, 0x0a, 0x18, 0x47, + 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, + 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, + 0x6e, 0x12, 0x1d, 0x0a, 0x0a, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x64, 0x61, 0x74, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x44, 0x61, 0x74, 0x65, + 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x48, 0x61, 0x73, + 0x68, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x5f, 0x64, 0x61, 0x74, 0x65, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x44, 0x61, + 0x74, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x5f, 0x75, 0x72, + 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, + 0x55, 0x72, 0x6c, 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x73, 0x5f, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, + 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x69, 0x73, 0x49, + 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x12, 0x7b, 0x0a, 0x1a, 0x64, 0x65, + 0x76, 0x69, 0x63, 0x65, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x3d, + 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x43, + 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x41, 0x75, 0x74, 0x68, 0x65, + 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x6f, 0x64, 0x65, 0x52, 0x18, 0x64, + 0x65, 0x76, 0x69, 0x63, 0x65, 0x41, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x4f, 0x0a, 0x13, 0x72, 0x65, 0x6d, 0x6f, 0x74, + 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x18, 0x08, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, + 0x62, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, + 0x6e, 0x69, 0x6e, 0x67, 0x52, 0x12, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, + 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x12, 0x14, 0x0a, 0x05, 0x6f, 0x77, 0x6e, 0x65, + 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x12, 0x34, + 0x0a, 0x0a, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x0a, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, 0x62, 0x2e, + 0x42, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x62, 0x75, 0x69, 0x6c, 0x64, + 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x2b, 0x0a, 0x02, 0x75, 0x69, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x1b, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, 0x62, 0x2e, 0x55, 0x49, + 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x02, 0x75, + 0x69, 0x22, 0x4b, 0x0a, 0x18, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x41, 0x75, 0x74, 0x68, 0x65, + 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x12, 0x0a, + 0x0e, 0x50, 0x52, 0x45, 0x5f, 0x53, 0x48, 0x41, 0x52, 0x45, 0x44, 0x5f, 0x4b, 0x45, 0x59, 0x10, + 0x00, 0x12, 0x08, 0x0a, 0x04, 0x58, 0x35, 0x30, 0x39, 0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x55, + 0x4e, 0x49, 0x4e, 0x49, 0x54, 0x49, 0x41, 0x4c, 0x49, 0x5a, 0x45, 0x44, 0x10, 0x02, 0x42, 0x2e, + 0x5a, 0x2c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x6c, 0x67, + 0x64, 0x2d, 0x64, 0x65, 0x76, 0x2f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x2d, 0x61, 0x70, 0x70, + 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x70, 0x62, 0x3b, 0x70, 0x62, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -752,7 +764,7 @@ func file_github_com_plgd_dev_client_application_pb_get_configuration_proto_rawD var file_github_com_plgd_dev_client_application_pb_get_configuration_proto_enumTypes = make([]protoimpl.EnumInfo, 2) var file_github_com_plgd_dev_client_application_pb_get_configuration_proto_msgTypes = make([]protoimpl.MessageInfo, 6) -var file_github_com_plgd_dev_client_application_pb_get_configuration_proto_goTypes = []interface{}{ +var file_github_com_plgd_dev_client_application_pb_get_configuration_proto_goTypes = []any{ (RemoteProvisioning_Mode)(0), // 0: service.pb.RemoteProvisioning.Mode (GetConfigurationResponse_DeviceAuthenticationMode)(0), // 1: service.pb.GetConfigurationResponse.DeviceAuthenticationMode (*GetConfigurationRequest)(nil), // 2: service.pb.GetConfigurationRequest @@ -761,23 +773,23 @@ var file_github_com_plgd_dev_client_application_pb_get_configuration_proto_goTyp (*BuildInfo)(nil), // 5: service.pb.BuildInfo (*UIConfiguration)(nil), // 6: service.pb.UIConfiguration (*GetConfigurationResponse)(nil), // 7: service.pb.GetConfigurationResponse - (*pb.WebOAuthClient)(nil), // 8: grpcgateway.pb.WebOAuthClient - (*pb.DeviceOAuthClient)(nil), // 9: grpcgateway.pb.DeviceOAuthClient + (*pb.OAuthClient)(nil), // 8: grpcgateway.pb.OAuthClient } var file_github_com_plgd_dev_client_application_pb_get_configuration_proto_depIdxs = []int32{ - 8, // 0: service.pb.RemoteProvisioning.web_oauth_client:type_name -> grpcgateway.pb.WebOAuthClient - 9, // 1: service.pb.RemoteProvisioning.device_oauth_client:type_name -> grpcgateway.pb.DeviceOAuthClient - 0, // 2: service.pb.RemoteProvisioning.mode:type_name -> service.pb.RemoteProvisioning.Mode - 3, // 3: service.pb.RemoteProvisioning.user_agent:type_name -> service.pb.UserAgent - 1, // 4: service.pb.GetConfigurationResponse.device_authentication_mode:type_name -> service.pb.GetConfigurationResponse.DeviceAuthenticationMode - 4, // 5: service.pb.GetConfigurationResponse.remote_provisioning:type_name -> service.pb.RemoteProvisioning - 5, // 6: service.pb.GetConfigurationResponse.build_info:type_name -> service.pb.BuildInfo - 6, // 7: service.pb.GetConfigurationResponse.ui:type_name -> service.pb.UIConfiguration - 8, // [8:8] is the sub-list for method output_type - 8, // [8:8] is the sub-list for method input_type - 8, // [8:8] is the sub-list for extension type_name - 8, // [8:8] is the sub-list for extension extendee - 0, // [0:8] is the sub-list for field type_name + 8, // 0: service.pb.RemoteProvisioning.web_oauth_client:type_name -> grpcgateway.pb.OAuthClient + 8, // 1: service.pb.RemoteProvisioning.device_oauth_client:type_name -> grpcgateway.pb.OAuthClient + 8, // 2: service.pb.RemoteProvisioning.m2m_oauth_client:type_name -> grpcgateway.pb.OAuthClient + 0, // 3: service.pb.RemoteProvisioning.mode:type_name -> service.pb.RemoteProvisioning.Mode + 3, // 4: service.pb.RemoteProvisioning.user_agent:type_name -> service.pb.UserAgent + 1, // 5: service.pb.GetConfigurationResponse.device_authentication_mode:type_name -> service.pb.GetConfigurationResponse.DeviceAuthenticationMode + 4, // 6: service.pb.GetConfigurationResponse.remote_provisioning:type_name -> service.pb.RemoteProvisioning + 5, // 7: service.pb.GetConfigurationResponse.build_info:type_name -> service.pb.BuildInfo + 6, // 8: service.pb.GetConfigurationResponse.ui:type_name -> service.pb.UIConfiguration + 9, // [9:9] is the sub-list for method output_type + 9, // [9:9] is the sub-list for method input_type + 9, // [9:9] is the sub-list for extension type_name + 9, // [9:9] is the sub-list for extension extendee + 0, // [0:9] is the sub-list for field type_name } func init() { file_github_com_plgd_dev_client_application_pb_get_configuration_proto_init() } @@ -786,7 +798,7 @@ func file_github_com_plgd_dev_client_application_pb_get_configuration_proto_init return } if !protoimpl.UnsafeEnabled { - file_github_com_plgd_dev_client_application_pb_get_configuration_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_get_configuration_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*GetConfigurationRequest); i { case 0: return &v.state @@ -798,7 +810,7 @@ func file_github_com_plgd_dev_client_application_pb_get_configuration_proto_init return nil } } - file_github_com_plgd_dev_client_application_pb_get_configuration_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_get_configuration_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*UserAgent); i { case 0: return &v.state @@ -810,7 +822,7 @@ func file_github_com_plgd_dev_client_application_pb_get_configuration_proto_init return nil } } - file_github_com_plgd_dev_client_application_pb_get_configuration_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_get_configuration_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*RemoteProvisioning); i { case 0: return &v.state @@ -822,7 +834,7 @@ func file_github_com_plgd_dev_client_application_pb_get_configuration_proto_init return nil } } - file_github_com_plgd_dev_client_application_pb_get_configuration_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_get_configuration_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*BuildInfo); i { case 0: return &v.state @@ -834,7 +846,7 @@ func file_github_com_plgd_dev_client_application_pb_get_configuration_proto_init return nil } } - file_github_com_plgd_dev_client_application_pb_get_configuration_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_get_configuration_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*UIConfiguration); i { case 0: return &v.state @@ -846,7 +858,7 @@ func file_github_com_plgd_dev_client_application_pb_get_configuration_proto_init return nil } } - file_github_com_plgd_dev_client_application_pb_get_configuration_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_get_configuration_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*GetConfigurationResponse); i { case 0: return &v.state diff --git a/pb/get_configuration.proto b/pb/get_configuration.proto index 95818c91..ee695c2e 100644 --- a/pb/get_configuration.proto +++ b/pb/get_configuration.proto @@ -25,78 +25,88 @@ option go_package = "github.com/plgd-dev/client-application/pb;pb"; message GetConfigurationRequest {} message UserAgent { - // in nanoseconds - int64 csr_challenge_state_expiration = 1; // @gotags: yaml:"csrChallengeStateExpiration" + // in nanoseconds + int64 csr_challenge_state_expiration = + 1; // @gotags: yaml:"csrChallengeStateExpiration" } message RemoteProvisioning { - // similar to https://github.com/plgd-dev/hub/blob/ca24aa39111bfc97fd27c0cff9d0ce7e22d82818/grpc-gateway/pb/hubConfiguration.proto#L24 - reserved 3, 8, 10; - enum Mode { - MODE_NONE = 0; - USER_AGENT = 1; - }; - int64 current_time = 1; // @gotags: yaml:"-" - string jwt_owner_claim = 2; // @gotags: yaml:"ownerClaim" - // Hub ID - string id = 4; // @gotags: yaml:"hubID" - // coap-gateway in format coaps+tcp://host:port - string coap_gateway = 5; // @gotags: yaml:"coapGateway" - // certificate_authorities in format PEM - can contain multiple certificates - string certificate_authorities = 6; // @gotags: yaml:"-" - // authority in format https://host:port - string authority = 7; // @gotags: yaml:"authority" - // certificate_authority in format https://host:port - string certificate_authority = 9; // @gotags: yaml:"certificateAuthority" - // http-gateway in format https://host:port - // string http_gateway_address = 10; // @gotags: yaml:"-" - grpcgateway.pb.WebOAuthClient web_oauth_client = 11; // @gotags: yaml:"webOAuthClient" - grpcgateway.pb.DeviceOAuthClient device_oauth_client = 12; // @gotags: yaml:"deviceOAuthClient" - - Mode mode = 100; // @gotags: yaml:"mode" - UserAgent user_agent = 101; // @gotags: yaml:"userAgent" - repeated string ca_pool = 102; // @gotags: yaml:"caPool" + // similar to + // https://github.com/plgd-dev/hub/blob/ca24aa39111bfc97fd27c0cff9d0ce7e22d82818/grpc-gateway/pb/hubConfiguration.proto#L24 + reserved 3, 8, 10; + enum Mode { + MODE_NONE = 0; + USER_AGENT = 1; + }; + int64 current_time = 1; // @gotags: yaml:"-" + string jwt_owner_claim = 2; // @gotags: yaml:"ownerClaim" + // Hub ID + string id = 4; // @gotags: yaml:"hubID" + // coap-gateway in format coaps+tcp://host:port + string coap_gateway = 5; // @gotags: yaml:"coapGateway" + // certificate_authorities in format PEM - can contain multiple certificates + string certificate_authorities = 6; // @gotags: yaml:"-" + // authority in format https://host:port + string authority = 7; // @gotags: yaml:"authority" + // certificate_authority in format https://host:port + string certificate_authority = 9; // @gotags: yaml:"certificateAuthority" + // http-gateway in format https://host:port + // string http_gateway_address = 10; // @gotags: yaml:"-" + grpcgateway.pb.OAuthClient web_oauth_client = + 11; // @gotags: yaml:"webOAuthClient" + grpcgateway.pb.OAuthClient device_oauth_client = + 12; // @gotags: yaml:"deviceOAuthClient" + grpcgateway.pb.OAuthClient m2m_oauth_client = + 13; // @gotags: yaml:"m2mOAuthClient" - // exposes default command time to live in nanoseconds for CreateResource, RetrieveResource, UpdateResource, DeleteResource, and UpdateDeviceMetadata commands when it is not set in the request. 0 - means forever. - //int64 default_command_time_to_live = 8; + Mode mode = 100; // @gotags: yaml:"mode" + UserAgent user_agent = 101; // @gotags: yaml:"userAgent" + repeated string ca_pool = 102; // @gotags: yaml:"caPool" + + // exposes default command time to live in nanoseconds for CreateResource, + // RetrieveResource, UpdateResource, DeleteResource, and UpdateDeviceMetadata + // commands when it is not set in the request. 0 - means forever. + // int64 default_command_time_to_live = 8; } message BuildInfo { - // version of the service - string version = 1; - // build date of the service - string build_date = 2; - // commit hash of the service - string commit_hash = 3; - // commit date of the service - string commit_date = 4; - // release url of the service - string release_url = 5; + // version of the service + string version = 1; + // build date of the service + string build_date = 2; + // commit hash of the service + string commit_hash = 3; + // commit date of the service + string commit_date = 4; + // release url of the service + string release_url = 5; } // UI configuration message UIConfiguration { - // similar to https://github.com/plgd-dev/hub/blob/4c4861a4bc483ba4080a1d448063da392eff4026/grpc-gateway/pb/hubConfiguration.proto#L61 + // similar to + // https://github.com/plgd-dev/hub/blob/4c4861a4bc483ba4080a1d448063da392eff4026/grpc-gateway/pb/hubConfiguration.proto#L61 - int64 default_discovery_timeout = 100; // default discovery timeout in nanoseconds + int64 default_discovery_timeout = + 100; // default discovery timeout in nanoseconds } message GetConfigurationResponse { - enum DeviceAuthenticationMode { - PRE_SHARED_KEY = 0; - X509 = 1; - UNINITIALIZED = 2; - }; - string version = 1; // deprecated, use build_info.version - string build_date = 2; // deprecated, use build_info.build_date - string commit_hash = 3; // deprecated, use build_info.commit_hash - string commit_date = 4; // deprecated, use build_info.commit_date - string release_url = 5; // deprecated, use build_info.release_url - // user don't need to call initialize endpoint - bool is_initialized = 6; - DeviceAuthenticationMode device_authentication_mode = 7; - RemoteProvisioning remote_provisioning = 8; - string owner = 9; - BuildInfo build_info = 10; - UIConfiguration ui = 11; + enum DeviceAuthenticationMode { + PRE_SHARED_KEY = 0; + X509 = 1; + UNINITIALIZED = 2; + }; + string version = 1; // deprecated, use build_info.version + string build_date = 2; // deprecated, use build_info.build_date + string commit_hash = 3; // deprecated, use build_info.commit_hash + string commit_date = 4; // deprecated, use build_info.commit_date + string release_url = 5; // deprecated, use build_info.release_url + // user don't need to call initialize endpoint + bool is_initialized = 6; + DeviceAuthenticationMode device_authentication_mode = 7; + RemoteProvisioning remote_provisioning = 8; + string owner = 9; + BuildInfo build_info = 10; + UIConfiguration ui = 11; } \ No newline at end of file diff --git a/pb/get_device.pb.go b/pb/get_device.pb.go index 4490b044..1acf5fe8 100644 --- a/pb/get_device.pb.go +++ b/pb/get_device.pb.go @@ -16,8 +16,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v4.25.1 +// protoc-gen-go v1.34.2 +// protoc v5.27.3 // source: github.com/plgd-dev/client-application/pb/get_device.proto package pb @@ -113,7 +113,7 @@ func file_github_com_plgd_dev_client_application_pb_get_device_proto_rawDescGZIP } var file_github_com_plgd_dev_client_application_pb_get_device_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_plgd_dev_client_application_pb_get_device_proto_goTypes = []interface{}{ +var file_github_com_plgd_dev_client_application_pb_get_device_proto_goTypes = []any{ (*GetDeviceRequest)(nil), // 0: service.pb.GetDeviceRequest } var file_github_com_plgd_dev_client_application_pb_get_device_proto_depIdxs = []int32{ @@ -130,7 +130,7 @@ func file_github_com_plgd_dev_client_application_pb_get_device_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_github_com_plgd_dev_client_application_pb_get_device_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_get_device_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*GetDeviceRequest); i { case 0: return &v.state diff --git a/pb/get_device_resource_links.pb.go b/pb/get_device_resource_links.pb.go index 0cdf8856..b12b6d69 100644 --- a/pb/get_device_resource_links.pb.go +++ b/pb/get_device_resource_links.pb.go @@ -16,8 +16,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v4.25.1 +// protoc-gen-go v1.34.2 +// protoc v5.27.3 // source: github.com/plgd-dev/client-application/pb/get_device_resource_links.proto package pb @@ -114,7 +114,7 @@ func file_github_com_plgd_dev_client_application_pb_get_device_resource_links_pr } var file_github_com_plgd_dev_client_application_pb_get_device_resource_links_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_plgd_dev_client_application_pb_get_device_resource_links_proto_goTypes = []interface{}{ +var file_github_com_plgd_dev_client_application_pb_get_device_resource_links_proto_goTypes = []any{ (*GetDeviceResourceLinksRequest)(nil), // 0: service.pb.GetDeviceResourceLinksRequest } var file_github_com_plgd_dev_client_application_pb_get_device_resource_links_proto_depIdxs = []int32{ @@ -131,7 +131,7 @@ func file_github_com_plgd_dev_client_application_pb_get_device_resource_links_pr return } if !protoimpl.UnsafeEnabled { - file_github_com_plgd_dev_client_application_pb_get_device_resource_links_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_get_device_resource_links_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*GetDeviceResourceLinksRequest); i { case 0: return &v.state diff --git a/pb/get_devices.pb.go b/pb/get_devices.pb.go index 4098b9b9..aabb3207 100644 --- a/pb/get_devices.pb.go +++ b/pb/get_devices.pb.go @@ -16,8 +16,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v4.25.1 +// protoc-gen-go v1.34.2 +// protoc v5.27.3 // source: github.com/plgd-dev/client-application/pb/get_devices.proto package pb @@ -281,7 +281,7 @@ func file_github_com_plgd_dev_client_application_pb_get_devices_proto_rawDescGZI var file_github_com_plgd_dev_client_application_pb_get_devices_proto_enumTypes = make([]protoimpl.EnumInfo, 2) var file_github_com_plgd_dev_client_application_pb_get_devices_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_plgd_dev_client_application_pb_get_devices_proto_goTypes = []interface{}{ +var file_github_com_plgd_dev_client_application_pb_get_devices_proto_goTypes = []any{ (GetDevicesRequest_OwnershipStatusFilter)(0), // 0: service.pb.GetDevicesRequest.OwnershipStatusFilter (GetDevicesRequest_UseMulticast)(0), // 1: service.pb.GetDevicesRequest.UseMulticast (*GetDevicesRequest)(nil), // 2: service.pb.GetDevicesRequest @@ -302,7 +302,7 @@ func file_github_com_plgd_dev_client_application_pb_get_devices_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_github_com_plgd_dev_client_application_pb_get_devices_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_get_devices_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*GetDevicesRequest); i { case 0: return &v.state diff --git a/pb/get_identity_certificate.pb.go b/pb/get_identity_certificate.pb.go index 70338266..990af5ee 100644 --- a/pb/get_identity_certificate.pb.go +++ b/pb/get_identity_certificate.pb.go @@ -16,8 +16,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v4.25.1 +// protoc-gen-go v1.34.2 +// protoc v5.27.3 // source: github.com/plgd-dev/client-application/pb/get_identity_certificate.proto package pb @@ -155,7 +155,7 @@ func file_github_com_plgd_dev_client_application_pb_get_identity_certificate_pro } var file_github_com_plgd_dev_client_application_pb_get_identity_certificate_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_github_com_plgd_dev_client_application_pb_get_identity_certificate_proto_goTypes = []interface{}{ +var file_github_com_plgd_dev_client_application_pb_get_identity_certificate_proto_goTypes = []any{ (*GetIdentityCertificateRequest)(nil), // 0: service.pb.GetIdentityCertificateRequest (*GetIdentityCertificateResponse)(nil), // 1: service.pb.GetIdentityCertificateResponse } @@ -173,7 +173,7 @@ func file_github_com_plgd_dev_client_application_pb_get_identity_certificate_pro return } if !protoimpl.UnsafeEnabled { - file_github_com_plgd_dev_client_application_pb_get_identity_certificate_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_get_identity_certificate_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*GetIdentityCertificateRequest); i { case 0: return &v.state @@ -185,7 +185,7 @@ func file_github_com_plgd_dev_client_application_pb_get_identity_certificate_pro return nil } } - file_github_com_plgd_dev_client_application_pb_get_identity_certificate_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_get_identity_certificate_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*GetIdentityCertificateResponse); i { case 0: return &v.state diff --git a/pb/get_json_web_keys.pb.go b/pb/get_json_web_keys.pb.go index 8cdfb353..c2ef7b35 100644 --- a/pb/get_json_web_keys.pb.go +++ b/pb/get_json_web_keys.pb.go @@ -16,8 +16,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v4.25.1 +// protoc-gen-go v1.34.2 +// protoc v5.27.3 // source: github.com/plgd-dev/client-application/pb/get_json_web_keys.proto package pb @@ -102,7 +102,7 @@ func file_github_com_plgd_dev_client_application_pb_get_json_web_keys_proto_rawD } var file_github_com_plgd_dev_client_application_pb_get_json_web_keys_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_plgd_dev_client_application_pb_get_json_web_keys_proto_goTypes = []interface{}{ +var file_github_com_plgd_dev_client_application_pb_get_json_web_keys_proto_goTypes = []any{ (*GetJSONWebKeysRequest)(nil), // 0: service.pb.GetJSONWebKeysRequest } var file_github_com_plgd_dev_client_application_pb_get_json_web_keys_proto_depIdxs = []int32{ @@ -119,7 +119,7 @@ func file_github_com_plgd_dev_client_application_pb_get_json_web_keys_proto_init return } if !protoimpl.UnsafeEnabled { - file_github_com_plgd_dev_client_application_pb_get_json_web_keys_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_get_json_web_keys_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*GetJSONWebKeysRequest); i { case 0: return &v.state diff --git a/pb/get_resource.pb.go b/pb/get_resource.pb.go index 1c000da1..36a16fcd 100644 --- a/pb/get_resource.pb.go +++ b/pb/get_resource.pb.go @@ -16,8 +16,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v4.25.1 +// protoc-gen-go v1.34.2 +// protoc v5.27.3 // source: github.com/plgd-dev/client-application/pb/get_resource.proto package pb @@ -130,7 +130,7 @@ func file_github_com_plgd_dev_client_application_pb_get_resource_proto_rawDescGZ } var file_github_com_plgd_dev_client_application_pb_get_resource_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_plgd_dev_client_application_pb_get_resource_proto_goTypes = []interface{}{ +var file_github_com_plgd_dev_client_application_pb_get_resource_proto_goTypes = []any{ (*GetResourceRequest)(nil), // 0: service.pb.GetResourceRequest (*commands.ResourceId)(nil), // 1: resourceaggregate.pb.ResourceId } @@ -149,7 +149,7 @@ func file_github_com_plgd_dev_client_application_pb_get_resource_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_github_com_plgd_dev_client_application_pb_get_resource_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_get_resource_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*GetResourceRequest); i { case 0: return &v.state diff --git a/pb/initialize.pb.go b/pb/initialize.pb.go index 81e0578a..85a0995c 100644 --- a/pb/initialize.pb.go +++ b/pb/initialize.pb.go @@ -16,8 +16,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v4.25.1 +// protoc-gen-go v1.34.2 +// protoc v5.27.3 // source: github.com/plgd-dev/client-application/pb/initialize.proto package pb @@ -479,7 +479,7 @@ func file_github_com_plgd_dev_client_application_pb_initialize_proto_rawDescGZIP } var file_github_com_plgd_dev_client_application_pb_initialize_proto_msgTypes = make([]protoimpl.MessageInfo, 7) -var file_github_com_plgd_dev_client_application_pb_initialize_proto_goTypes = []interface{}{ +var file_github_com_plgd_dev_client_application_pb_initialize_proto_goTypes = []any{ (*InitializePreSharedKey)(nil), // 0: service.pb.InitializePreSharedKey (*InitializeX509)(nil), // 1: service.pb.InitializeX509 (*InitializeRequest)(nil), // 2: service.pb.InitializeRequest @@ -506,7 +506,7 @@ func file_github_com_plgd_dev_client_application_pb_initialize_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_github_com_plgd_dev_client_application_pb_initialize_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_initialize_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*InitializePreSharedKey); i { case 0: return &v.state @@ -518,7 +518,7 @@ func file_github_com_plgd_dev_client_application_pb_initialize_proto_init() { return nil } } - file_github_com_plgd_dev_client_application_pb_initialize_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_initialize_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*InitializeX509); i { case 0: return &v.state @@ -530,7 +530,7 @@ func file_github_com_plgd_dev_client_application_pb_initialize_proto_init() { return nil } } - file_github_com_plgd_dev_client_application_pb_initialize_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_initialize_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*InitializeRequest); i { case 0: return &v.state @@ -542,7 +542,7 @@ func file_github_com_plgd_dev_client_application_pb_initialize_proto_init() { return nil } } - file_github_com_plgd_dev_client_application_pb_initialize_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_initialize_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*IdentityCertificateChallenge); i { case 0: return &v.state @@ -554,7 +554,7 @@ func file_github_com_plgd_dev_client_application_pb_initialize_proto_init() { return nil } } - file_github_com_plgd_dev_client_application_pb_initialize_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_initialize_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*InitializeResponse); i { case 0: return &v.state @@ -566,7 +566,7 @@ func file_github_com_plgd_dev_client_application_pb_initialize_proto_init() { return nil } } - file_github_com_plgd_dev_client_application_pb_initialize_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_initialize_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*FinishInitializeRequest); i { case 0: return &v.state @@ -578,7 +578,7 @@ func file_github_com_plgd_dev_client_application_pb_initialize_proto_init() { return nil } } - file_github_com_plgd_dev_client_application_pb_initialize_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_initialize_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*FinishInitializeResponse); i { case 0: return &v.state diff --git a/pb/offboard_device.pb.go b/pb/offboard_device.pb.go index f7dcf642..9793486a 100644 --- a/pb/offboard_device.pb.go +++ b/pb/offboard_device.pb.go @@ -16,8 +16,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v4.25.1 +// protoc-gen-go v1.34.2 +// protoc v5.27.3 // source: github.com/plgd-dev/client-application/pb/offboard_device.proto package pb @@ -153,7 +153,7 @@ func file_github_com_plgd_dev_client_application_pb_offboard_device_proto_rawDes } var file_github_com_plgd_dev_client_application_pb_offboard_device_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_github_com_plgd_dev_client_application_pb_offboard_device_proto_goTypes = []interface{}{ +var file_github_com_plgd_dev_client_application_pb_offboard_device_proto_goTypes = []any{ (*OffboardDeviceRequest)(nil), // 0: service.pb.OffboardDeviceRequest (*OffboardDeviceResponse)(nil), // 1: service.pb.OffboardDeviceResponse } @@ -171,7 +171,7 @@ func file_github_com_plgd_dev_client_application_pb_offboard_device_proto_init() return } if !protoimpl.UnsafeEnabled { - file_github_com_plgd_dev_client_application_pb_offboard_device_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_offboard_device_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*OffboardDeviceRequest); i { case 0: return &v.state @@ -183,7 +183,7 @@ func file_github_com_plgd_dev_client_application_pb_offboard_device_proto_init() return nil } } - file_github_com_plgd_dev_client_application_pb_offboard_device_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_offboard_device_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*OffboardDeviceResponse); i { case 0: return &v.state diff --git a/pb/onboard_device.pb.go b/pb/onboard_device.pb.go index 62631506..c9235f6b 100644 --- a/pb/onboard_device.pb.go +++ b/pb/onboard_device.pb.go @@ -16,8 +16,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v4.25.1 +// protoc-gen-go v1.34.2 +// protoc v5.27.3 // source: github.com/plgd-dev/client-application/pb/onboard_device.proto package pb @@ -213,7 +213,7 @@ func file_github_com_plgd_dev_client_application_pb_onboard_device_proto_rawDesc } var file_github_com_plgd_dev_client_application_pb_onboard_device_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_github_com_plgd_dev_client_application_pb_onboard_device_proto_goTypes = []interface{}{ +var file_github_com_plgd_dev_client_application_pb_onboard_device_proto_goTypes = []any{ (*OnboardDeviceRequest)(nil), // 0: service.pb.OnboardDeviceRequest (*OnboardDeviceResponse)(nil), // 1: service.pb.OnboardDeviceResponse } @@ -231,7 +231,7 @@ func file_github_com_plgd_dev_client_application_pb_onboard_device_proto_init() return } if !protoimpl.UnsafeEnabled { - file_github_com_plgd_dev_client_application_pb_onboard_device_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_onboard_device_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*OnboardDeviceRequest); i { case 0: return &v.state @@ -243,7 +243,7 @@ func file_github_com_plgd_dev_client_application_pb_onboard_device_proto_init() return nil } } - file_github_com_plgd_dev_client_application_pb_onboard_device_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_onboard_device_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*OnboardDeviceResponse); i { case 0: return &v.state diff --git a/pb/own_device.pb.go b/pb/own_device.pb.go index 27cd3905..0594be4e 100644 --- a/pb/own_device.pb.go +++ b/pb/own_device.pb.go @@ -16,8 +16,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v4.25.1 +// protoc-gen-go v1.34.2 +// protoc v5.27.3 // source: github.com/plgd-dev/client-application/pb/own_device.proto package pb @@ -292,7 +292,7 @@ func file_github_com_plgd_dev_client_application_pb_own_device_proto_rawDescGZIP } var file_github_com_plgd_dev_client_application_pb_own_device_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_github_com_plgd_dev_client_application_pb_own_device_proto_goTypes = []interface{}{ +var file_github_com_plgd_dev_client_application_pb_own_device_proto_goTypes = []any{ (*OwnDeviceRequest)(nil), // 0: service.pb.OwnDeviceRequest (*OwnDeviceResponse)(nil), // 1: service.pb.OwnDeviceResponse (*FinishOwnDeviceRequest)(nil), // 2: service.pb.FinishOwnDeviceRequest @@ -315,7 +315,7 @@ func file_github_com_plgd_dev_client_application_pb_own_device_proto_init() { } file_pb_initialize_proto_init() if !protoimpl.UnsafeEnabled { - file_github_com_plgd_dev_client_application_pb_own_device_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_own_device_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*OwnDeviceRequest); i { case 0: return &v.state @@ -327,7 +327,7 @@ func file_github_com_plgd_dev_client_application_pb_own_device_proto_init() { return nil } } - file_github_com_plgd_dev_client_application_pb_own_device_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_own_device_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*OwnDeviceResponse); i { case 0: return &v.state @@ -339,7 +339,7 @@ func file_github_com_plgd_dev_client_application_pb_own_device_proto_init() { return nil } } - file_github_com_plgd_dev_client_application_pb_own_device_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_own_device_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*FinishOwnDeviceRequest); i { case 0: return &v.state @@ -351,7 +351,7 @@ func file_github_com_plgd_dev_client_application_pb_own_device_proto_init() { return nil } } - file_github_com_plgd_dev_client_application_pb_own_device_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_own_device_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*FinishOwnDeviceResponse); i { case 0: return &v.state diff --git a/pb/reset.pb.go b/pb/reset.pb.go index 6f783dca..90eb4da3 100644 --- a/pb/reset.pb.go +++ b/pb/reset.pb.go @@ -16,8 +16,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v4.25.1 +// protoc-gen-go v1.34.2 +// protoc v5.27.3 // source: github.com/plgd-dev/client-application/pb/reset.proto package pb @@ -140,7 +140,7 @@ func file_github_com_plgd_dev_client_application_pb_reset_proto_rawDescGZIP() [] } var file_github_com_plgd_dev_client_application_pb_reset_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_github_com_plgd_dev_client_application_pb_reset_proto_goTypes = []interface{}{ +var file_github_com_plgd_dev_client_application_pb_reset_proto_goTypes = []any{ (*ResetRequest)(nil), // 0: service.pb.ResetRequest (*ResetResponse)(nil), // 1: service.pb.ResetResponse } @@ -158,7 +158,7 @@ func file_github_com_plgd_dev_client_application_pb_reset_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_github_com_plgd_dev_client_application_pb_reset_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_reset_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ResetRequest); i { case 0: return &v.state @@ -170,7 +170,7 @@ func file_github_com_plgd_dev_client_application_pb_reset_proto_init() { return nil } } - file_github_com_plgd_dev_client_application_pb_reset_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_reset_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*ResetResponse); i { case 0: return &v.state diff --git a/pb/service.pb.gw.go b/pb/service.pb.gw.go index 4f009610..3a79fcf0 100644 --- a/pb/service.pb.gw.go +++ b/pb/service.pb.gw.go @@ -164,7 +164,7 @@ func local_request_ClientApplication_GetDeviceResourceLinks_0(ctx context.Contex } var ( - filter_ClientApplication_GetResource_0 = &utilities.DoubleArray{Encoding: map[string]int{"resource_id": 0, "device_id": 1, "deviceId": 2, "href": 3}, Base: []int{1, 3, 1, 4, 5, 0, 3, 0, 0, 0}, Check: []int{0, 1, 2, 1, 1, 3, 2, 7, 4, 5}} + filter_ClientApplication_GetResource_0 = &utilities.DoubleArray{Encoding: map[string]int{"resource_id": 0, "device_id": 1, "href": 2}, Base: []int{1, 1, 1, 2, 0, 0}, Check: []int{0, 1, 2, 2, 3, 4}} ) func request_ClientApplication_GetResource_0(ctx context.Context, marshaler runtime.Marshaler, client ClientApplicationClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -254,18 +254,14 @@ func local_request_ClientApplication_GetResource_0(ctx context.Context, marshale } var ( - filter_ClientApplication_UpdateResource_0 = &utilities.DoubleArray{Encoding: map[string]int{"content": 0, "resource_id": 1, "device_id": 2, "deviceId": 3, "href": 4}, Base: []int{1, 2, 5, 3, 6, 7, 0, 0, 0, 5, 0, 0, 0}, Check: []int{0, 1, 1, 3, 1, 1, 2, 2, 4, 3, 10, 5, 6}} + filter_ClientApplication_UpdateResource_0 = &utilities.DoubleArray{Encoding: map[string]int{"content": 0, "resource_id": 1, "device_id": 2, "href": 3}, Base: []int{1, 1, 1, 2, 3, 0, 0, 0}, Check: []int{0, 1, 1, 3, 3, 2, 4, 5}} ) func request_ClientApplication_UpdateResource_0(ctx context.Context, marshaler runtime.Marshaler, client ClientApplicationClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq UpdateResourceRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Content); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Content); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -312,11 +308,7 @@ func local_request_ClientApplication_UpdateResource_0(ctx context.Context, marsh var protoReq UpdateResourceRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Content); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Content); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -360,18 +352,14 @@ func local_request_ClientApplication_UpdateResource_0(ctx context.Context, marsh } var ( - filter_ClientApplication_CreateResource_0 = &utilities.DoubleArray{Encoding: map[string]int{"content": 0, "resource_id": 1, "device_id": 2, "deviceId": 3, "href": 4}, Base: []int{1, 2, 5, 3, 6, 7, 0, 0, 0, 5, 0, 0, 0}, Check: []int{0, 1, 1, 3, 1, 1, 2, 2, 4, 3, 10, 5, 6}} + filter_ClientApplication_CreateResource_0 = &utilities.DoubleArray{Encoding: map[string]int{"content": 0, "resource_id": 1, "device_id": 2, "href": 3}, Base: []int{1, 1, 1, 2, 3, 0, 0, 0}, Check: []int{0, 1, 1, 3, 3, 2, 4, 5}} ) func request_ClientApplication_CreateResource_0(ctx context.Context, marshaler runtime.Marshaler, client ClientApplicationClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq CreateResourceRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Content); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Content); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -418,11 +406,7 @@ func local_request_ClientApplication_CreateResource_0(ctx context.Context, marsh var protoReq CreateResourceRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Content); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Content); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -466,7 +450,7 @@ func local_request_ClientApplication_CreateResource_0(ctx context.Context, marsh } var ( - filter_ClientApplication_DeleteResource_0 = &utilities.DoubleArray{Encoding: map[string]int{"resource_id": 0, "device_id": 1, "deviceId": 2, "href": 3}, Base: []int{1, 3, 1, 4, 5, 0, 3, 0, 0, 0}, Check: []int{0, 1, 2, 1, 1, 3, 2, 7, 4, 5}} + filter_ClientApplication_DeleteResource_0 = &utilities.DoubleArray{Encoding: map[string]int{"resource_id": 0, "device_id": 1, "href": 2}, Base: []int{1, 1, 1, 2, 0, 0}, Check: []int{0, 1, 2, 2, 3, 4}} ) func request_ClientApplication_DeleteResource_0(ctx context.Context, marshaler runtime.Marshaler, client ClientApplicationClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -559,11 +543,7 @@ func request_ClientApplication_OwnDevice_0(ctx context.Context, marshaler runtim var protoReq OwnDeviceRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -593,11 +573,7 @@ func local_request_ClientApplication_OwnDevice_0(ctx context.Context, marshaler var protoReq OwnDeviceRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -627,11 +603,7 @@ func request_ClientApplication_FinishOwnDevice_0(ctx context.Context, marshaler var protoReq FinishOwnDeviceRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -671,11 +643,7 @@ func local_request_ClientApplication_FinishOwnDevice_0(ctx context.Context, mars var protoReq FinishOwnDeviceRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -839,11 +807,7 @@ func request_ClientApplication_Initialize_0(ctx context.Context, marshaler runti var protoReq InitializeRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -856,11 +820,7 @@ func local_request_ClientApplication_Initialize_0(ctx context.Context, marshaler var protoReq InitializeRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -873,11 +833,7 @@ func request_ClientApplication_FinishInitialize_0(ctx context.Context, marshaler var protoReq FinishInitializeRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -907,11 +863,7 @@ func local_request_ClientApplication_FinishInitialize_0(ctx context.Context, mar var protoReq FinishInitializeRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -941,11 +893,7 @@ func request_ClientApplication_Reset_0(ctx context.Context, marshaler runtime.Ma var protoReq ResetRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -958,11 +906,7 @@ func local_request_ClientApplication_Reset_0(ctx context.Context, marshaler runt var protoReq ResetRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -975,11 +919,7 @@ func request_ClientApplication_OnboardDevice_0(ctx context.Context, marshaler ru var protoReq OnboardDeviceRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -1009,11 +949,7 @@ func local_request_ClientApplication_OnboardDevice_0(ctx context.Context, marsha var protoReq OnboardDeviceRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -1095,6 +1031,7 @@ func local_request_ClientApplication_OffboardDevice_0(ctx context.Context, marsh // UnaryRPC :call ClientApplicationServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterClientApplicationHandlerFromEndpoint instead. +// GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call. func RegisterClientApplicationHandlerServer(ctx context.Context, mux *runtime.ServeMux, server ClientApplicationServer) error { mux.Handle("GET", pattern_ClientApplication_GetDevices_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -1560,21 +1497,21 @@ func RegisterClientApplicationHandlerServer(ctx context.Context, mux *runtime.Se // RegisterClientApplicationHandlerFromEndpoint is same as RegisterClientApplicationHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterClientApplicationHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() @@ -1592,7 +1529,7 @@ func RegisterClientApplicationHandler(ctx context.Context, mux *runtime.ServeMux // to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "ClientApplicationClient". // Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "ClientApplicationClient" // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in -// "ClientApplicationClient" to call the correct interceptors. +// "ClientApplicationClient" to call the correct interceptors. This client ignores the HTTP middlewares. func RegisterClientApplicationHandlerClient(ctx context.Context, mux *runtime.ServeMux, client ClientApplicationClient) error { mux.Handle("GET", pattern_ClientApplication_GetDevices_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { diff --git a/pb/service.swagger.json b/pb/service.swagger.json index 1ae26bc5..fa9dc591 100644 --- a/pb/service.swagger.json +++ b/pb/service.swagger.json @@ -353,29 +353,7 @@ "in": "body", "required": true, "schema": { - "type": "object", - "properties": { - "coapGatewayAddress": { - "type": "string", - "title": "endpoint in format \u003cscheme\u003e://\u003chost\u003e:\u003cport\u003e" - }, - "authorizationCode": { - "type": "string", - "title": "authorization code from the hub" - }, - "authorizationProviderName": { - "type": "string", - "title": "authorization provider from the hub" - }, - "hubId": { - "type": "string", - "title": "hub id in uuid format to allow hub access to device" - }, - "certificateAuthorities": { - "type": "string", - "title": "list of hub certificate authorities in PEM format to verify the hub certificate" - } - } + "$ref": "#/definitions/ClientApplicationOnboardDeviceBody" } } ], @@ -420,14 +398,7 @@ "in": "body", "required": true, "schema": { - "type": "object", - "properties": { - "timeout": { - "type": "string", - "format": "int64", - "description": "Defines how long own process will wait for the OwnDeviceRequest with set_identity_certificate in nanoseconds. Default value is 15secs." - } - } + "$ref": "#/definitions/ClientApplicationOwnDeviceBody" } } ], @@ -479,14 +450,7 @@ "in": "body", "required": true, "schema": { - "type": "object", - "properties": { - "certificate": { - "type": "string", - "format": "byte", - "title": "Certificate chain in PEM format" - } - } + "$ref": "#/definitions/ClientApplicationFinishOwnDeviceBody" } } ], @@ -837,14 +801,7 @@ "in": "body", "required": true, "schema": { - "type": "object", - "properties": { - "certificate": { - "type": "string", - "format": "byte", - "title": "Certificate chain in PEM format" - } - } + "$ref": "#/definitions/ClientApplicationFinishInitializeBody" } } ], @@ -898,6 +855,61 @@ } }, "definitions": { + "ClientApplicationFinishInitializeBody": { + "type": "object", + "properties": { + "certificate": { + "type": "string", + "format": "byte", + "title": "Certificate chain in PEM format" + } + } + }, + "ClientApplicationFinishOwnDeviceBody": { + "type": "object", + "properties": { + "certificate": { + "type": "string", + "format": "byte", + "title": "Certificate chain in PEM format" + } + } + }, + "ClientApplicationOnboardDeviceBody": { + "type": "object", + "properties": { + "coapGatewayAddress": { + "type": "string", + "title": "endpoint in format \u003cscheme\u003e://\u003chost\u003e:\u003cport\u003e" + }, + "authorizationCode": { + "type": "string", + "title": "authorization code from the hub" + }, + "authorizationProviderName": { + "type": "string", + "title": "authorization provider from the hub" + }, + "hubId": { + "type": "string", + "title": "hub id in uuid format to allow hub access to device" + }, + "certificateAuthorities": { + "type": "string", + "title": "list of hub certificate authorities in PEM format to verify the hub certificate" + } + } + }, + "ClientApplicationOwnDeviceBody": { + "type": "object", + "properties": { + "timeout": { + "type": "string", + "format": "int64", + "description": "Defines how long own process will wait for the OwnDeviceRequest with set_identity_certificate in nanoseconds. Default value is 15secs." + } + } + }, "ConnectionProtocol": { "type": "string", "enum": [ @@ -1086,6 +1098,13 @@ "serviceId": { "type": "string", "description": "The service.ID, which identify the device being served, must be set when the status is ONLINE. However, during an OFFLINE event, they will be sed to empty values." + }, + "localEndpoints": { + "type": "array", + "items": { + "type": "string" + }, + "description": "The last local endpoints of the device, and it is set when the status is ONLINE." } } }, @@ -1150,28 +1169,6 @@ } } }, - "pbDeviceOAuthClient": { - "type": "object", - "properties": { - "clientId": { - "type": "string", - "title": "@gotags: yaml:\"clientID\"" - }, - "audience": { - "type": "string" - }, - "scopes": { - "type": "array", - "items": { - "type": "string" - } - }, - "providerName": { - "type": "string", - "title": "@gotags: yaml:\"providerName\"" - } - } - }, "pbDisownDeviceResponse": { "type": "object" }, @@ -1233,7 +1230,7 @@ "$ref": "#/definitions/servicepbBuildInfo" }, "ui": { - "$ref": "#/definitions/pbUIConfiguration" + "$ref": "#/definitions/servicepbUIConfiguration" } } }, @@ -1310,6 +1307,39 @@ } } }, + "pbOAuthClient": { + "type": "object", + "properties": { + "clientId": { + "type": "string", + "title": "@gotags: yaml:\"clientID\"" + }, + "audience": { + "type": "string" + }, + "scopes": { + "type": "array", + "items": { + "type": "string" + } + }, + "providerName": { + "type": "string", + "title": "@gotags: yaml:\"providerName\"" + }, + "clientAssertionType": { + "type": "string", + "title": "@gotags: yaml:\"clientAssertionType\"" + }, + "authority": { + "type": "string" + }, + "grantType": { + "type": "string", + "title": "@gotags: yaml:\"grantType\"" + } + } + }, "pbOffboardDeviceResponse": { "type": "object" }, @@ -1372,14 +1402,18 @@ "title": "certificate_authority in format https://host:port" }, "webOauthClient": { - "$ref": "#/definitions/pbWebOAuthClient", + "$ref": "#/definitions/pbOAuthClient", "description": "@gotags: yaml:\"webOAuthClient\"", "title": "http-gateway in format https://host:port\nstring http_gateway_address = 10; // @gotags: yaml:\"-\"" }, "deviceOauthClient": { - "$ref": "#/definitions/pbDeviceOAuthClient", + "$ref": "#/definitions/pbOAuthClient", "title": "@gotags: yaml:\"deviceOAuthClient\"" }, + "m2mOauthClient": { + "$ref": "#/definitions/pbOAuthClient", + "title": "@gotags: yaml:\"m2mOAuthClient\"" + }, "mode": { "$ref": "#/definitions/RemoteProvisioningMode", "title": "@gotags: yaml:\"mode\"" @@ -1426,6 +1460,12 @@ "format": "byte", "title": "etag of the resource used by twin synchronization" }, + "resourceTypes": { + "type": "array", + "items": { + "type": "string" + } + }, "openTelemetryCarrier": { "type": "object", "additionalProperties": { @@ -1453,6 +1493,12 @@ "eventMetadata": { "$ref": "#/definitions/resourceaggregatepbEventMetadata" }, + "resourceTypes": { + "type": "array", + "items": { + "type": "string" + } + }, "openTelemetryCarrier": { "type": "object", "additionalProperties": { @@ -1480,6 +1526,12 @@ "eventMetadata": { "$ref": "#/definitions/resourceaggregatepbEventMetadata" }, + "resourceTypes": { + "type": "array", + "items": { + "type": "string" + } + }, "openTelemetryCarrier": { "type": "object", "additionalProperties": { @@ -1547,6 +1599,12 @@ "eventMetadata": { "$ref": "#/definitions/resourceaggregatepbEventMetadata" }, + "resourceTypes": { + "type": "array", + "items": { + "type": "string" + } + }, "openTelemetryCarrier": { "type": "object", "additionalProperties": { @@ -1583,18 +1641,6 @@ } } }, - "pbUIConfiguration": { - "type": "object", - "properties": { - "defaultDiscoveryTimeout": { - "type": "string", - "format": "int64", - "title": "default discovery timeout in nanoseconds" - } - }, - "description": "similar to https://github.com/plgd-dev/hub/blob/4c4861a4bc483ba4080a1d448063da392eff4026/grpc-gateway/pb/hubConfiguration.proto#L61", - "title": "UI configuration" - }, "pbUserAgent": { "type": "object", "properties": { @@ -1606,24 +1652,6 @@ } } }, - "pbWebOAuthClient": { - "type": "object", - "properties": { - "clientId": { - "type": "string", - "title": "@gotags: yaml:\"clientID\"" - }, - "audience": { - "type": "string" - }, - "scopes": { - "type": "array", - "items": { - "type": "string" - } - } - } - }, "protobufAny": { "type": "object", "properties": { @@ -1792,6 +1820,18 @@ "title": "release url of the service" } } + }, + "servicepbUIConfiguration": { + "type": "object", + "properties": { + "defaultDiscoveryTimeout": { + "type": "string", + "format": "int64", + "title": "default discovery timeout in nanoseconds" + } + }, + "description": "similar to\n https://github.com/plgd-dev/hub/blob/4c4861a4bc483ba4080a1d448063da392eff4026/grpc-gateway/pb/hubConfiguration.proto#L61", + "title": "UI configuration" } }, "securityDefinitions": { diff --git a/pb/service_grpc.pb.go b/pb/service_grpc.pb.go index 75d8201a..0172281f 100644 --- a/pb/service_grpc.pb.go +++ b/pb/service_grpc.pb.go @@ -16,8 +16,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v4.25.1 +// - protoc-gen-go-grpc v1.5.1 +// - protoc v5.27.3 // source: github.com/plgd-dev/client-application/pb/service.proto package pb @@ -34,8 +34,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 const ( ClientApplication_GetDevices_FullMethodName = "/service.pb.ClientApplication/GetDevices" @@ -63,7 +63,7 @@ const ( // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type ClientApplicationClient interface { - GetDevices(ctx context.Context, in *GetDevicesRequest, opts ...grpc.CallOption) (ClientApplication_GetDevicesClient, error) + GetDevices(ctx context.Context, in *GetDevicesRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[pb.Device], error) GetDevice(ctx context.Context, in *GetDeviceRequest, opts ...grpc.CallOption) (*pb.Device, error) GetDeviceResourceLinks(ctx context.Context, in *GetDeviceResourceLinksRequest, opts ...grpc.CallOption) (*events.ResourceLinksPublished, error) GetResource(ctx context.Context, in *GetResourceRequest, opts ...grpc.CallOption) (*pb.Resource, error) @@ -92,12 +92,13 @@ func NewClientApplicationClient(cc grpc.ClientConnInterface) ClientApplicationCl return &clientApplicationClient{cc} } -func (c *clientApplicationClient) GetDevices(ctx context.Context, in *GetDevicesRequest, opts ...grpc.CallOption) (ClientApplication_GetDevicesClient, error) { - stream, err := c.cc.NewStream(ctx, &ClientApplication_ServiceDesc.Streams[0], ClientApplication_GetDevices_FullMethodName, opts...) +func (c *clientApplicationClient) GetDevices(ctx context.Context, in *GetDevicesRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[pb.Device], error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &ClientApplication_ServiceDesc.Streams[0], ClientApplication_GetDevices_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &clientApplicationGetDevicesClient{stream} + x := &grpc.GenericClientStream[GetDevicesRequest, pb.Device]{ClientStream: stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -107,26 +108,13 @@ func (c *clientApplicationClient) GetDevices(ctx context.Context, in *GetDevices return x, nil } -type ClientApplication_GetDevicesClient interface { - Recv() (*pb.Device, error) - grpc.ClientStream -} - -type clientApplicationGetDevicesClient struct { - grpc.ClientStream -} - -func (x *clientApplicationGetDevicesClient) Recv() (*pb.Device, error) { - m := new(pb.Device) - if err := x.ClientStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} +// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. +type ClientApplication_GetDevicesClient = grpc.ServerStreamingClient[pb.Device] func (c *clientApplicationClient) GetDevice(ctx context.Context, in *GetDeviceRequest, opts ...grpc.CallOption) (*pb.Device, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(pb.Device) - err := c.cc.Invoke(ctx, ClientApplication_GetDevice_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ClientApplication_GetDevice_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -134,8 +122,9 @@ func (c *clientApplicationClient) GetDevice(ctx context.Context, in *GetDeviceRe } func (c *clientApplicationClient) GetDeviceResourceLinks(ctx context.Context, in *GetDeviceResourceLinksRequest, opts ...grpc.CallOption) (*events.ResourceLinksPublished, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(events.ResourceLinksPublished) - err := c.cc.Invoke(ctx, ClientApplication_GetDeviceResourceLinks_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ClientApplication_GetDeviceResourceLinks_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -143,8 +132,9 @@ func (c *clientApplicationClient) GetDeviceResourceLinks(ctx context.Context, in } func (c *clientApplicationClient) GetResource(ctx context.Context, in *GetResourceRequest, opts ...grpc.CallOption) (*pb.Resource, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(pb.Resource) - err := c.cc.Invoke(ctx, ClientApplication_GetResource_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ClientApplication_GetResource_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -152,8 +142,9 @@ func (c *clientApplicationClient) GetResource(ctx context.Context, in *GetResour } func (c *clientApplicationClient) UpdateResource(ctx context.Context, in *UpdateResourceRequest, opts ...grpc.CallOption) (*pb.UpdateResourceResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(pb.UpdateResourceResponse) - err := c.cc.Invoke(ctx, ClientApplication_UpdateResource_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ClientApplication_UpdateResource_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -161,8 +152,9 @@ func (c *clientApplicationClient) UpdateResource(ctx context.Context, in *Update } func (c *clientApplicationClient) CreateResource(ctx context.Context, in *CreateResourceRequest, opts ...grpc.CallOption) (*pb.CreateResourceResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(pb.CreateResourceResponse) - err := c.cc.Invoke(ctx, ClientApplication_CreateResource_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ClientApplication_CreateResource_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -170,8 +162,9 @@ func (c *clientApplicationClient) CreateResource(ctx context.Context, in *Create } func (c *clientApplicationClient) DeleteResource(ctx context.Context, in *DeleteResourceRequest, opts ...grpc.CallOption) (*pb.DeleteResourceResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(pb.DeleteResourceResponse) - err := c.cc.Invoke(ctx, ClientApplication_DeleteResource_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ClientApplication_DeleteResource_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -179,8 +172,9 @@ func (c *clientApplicationClient) DeleteResource(ctx context.Context, in *Delete } func (c *clientApplicationClient) OwnDevice(ctx context.Context, in *OwnDeviceRequest, opts ...grpc.CallOption) (*OwnDeviceResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(OwnDeviceResponse) - err := c.cc.Invoke(ctx, ClientApplication_OwnDevice_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ClientApplication_OwnDevice_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -188,8 +182,9 @@ func (c *clientApplicationClient) OwnDevice(ctx context.Context, in *OwnDeviceRe } func (c *clientApplicationClient) FinishOwnDevice(ctx context.Context, in *FinishOwnDeviceRequest, opts ...grpc.CallOption) (*FinishOwnDeviceResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(FinishOwnDeviceResponse) - err := c.cc.Invoke(ctx, ClientApplication_FinishOwnDevice_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ClientApplication_FinishOwnDevice_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -197,8 +192,9 @@ func (c *clientApplicationClient) FinishOwnDevice(ctx context.Context, in *Finis } func (c *clientApplicationClient) DisownDevice(ctx context.Context, in *DisownDeviceRequest, opts ...grpc.CallOption) (*DisownDeviceResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(DisownDeviceResponse) - err := c.cc.Invoke(ctx, ClientApplication_DisownDevice_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ClientApplication_DisownDevice_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -206,8 +202,9 @@ func (c *clientApplicationClient) DisownDevice(ctx context.Context, in *DisownDe } func (c *clientApplicationClient) ClearCache(ctx context.Context, in *ClearCacheRequest, opts ...grpc.CallOption) (*ClearCacheResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(ClearCacheResponse) - err := c.cc.Invoke(ctx, ClientApplication_ClearCache_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ClientApplication_ClearCache_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -215,8 +212,9 @@ func (c *clientApplicationClient) ClearCache(ctx context.Context, in *ClearCache } func (c *clientApplicationClient) GetConfiguration(ctx context.Context, in *GetConfigurationRequest, opts ...grpc.CallOption) (*GetConfigurationResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(GetConfigurationResponse) - err := c.cc.Invoke(ctx, ClientApplication_GetConfiguration_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ClientApplication_GetConfiguration_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -224,8 +222,9 @@ func (c *clientApplicationClient) GetConfiguration(ctx context.Context, in *GetC } func (c *clientApplicationClient) GetJSONWebKeys(ctx context.Context, in *GetJSONWebKeysRequest, opts ...grpc.CallOption) (*structpb.Struct, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(structpb.Struct) - err := c.cc.Invoke(ctx, ClientApplication_GetJSONWebKeys_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ClientApplication_GetJSONWebKeys_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -233,8 +232,9 @@ func (c *clientApplicationClient) GetJSONWebKeys(ctx context.Context, in *GetJSO } func (c *clientApplicationClient) GetIdentityCertificate(ctx context.Context, in *GetIdentityCertificateRequest, opts ...grpc.CallOption) (*GetIdentityCertificateResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(GetIdentityCertificateResponse) - err := c.cc.Invoke(ctx, ClientApplication_GetIdentityCertificate_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ClientApplication_GetIdentityCertificate_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -242,8 +242,9 @@ func (c *clientApplicationClient) GetIdentityCertificate(ctx context.Context, in } func (c *clientApplicationClient) Initialize(ctx context.Context, in *InitializeRequest, opts ...grpc.CallOption) (*InitializeResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(InitializeResponse) - err := c.cc.Invoke(ctx, ClientApplication_Initialize_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ClientApplication_Initialize_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -251,8 +252,9 @@ func (c *clientApplicationClient) Initialize(ctx context.Context, in *Initialize } func (c *clientApplicationClient) FinishInitialize(ctx context.Context, in *FinishInitializeRequest, opts ...grpc.CallOption) (*FinishInitializeResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(FinishInitializeResponse) - err := c.cc.Invoke(ctx, ClientApplication_FinishInitialize_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ClientApplication_FinishInitialize_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -260,8 +262,9 @@ func (c *clientApplicationClient) FinishInitialize(ctx context.Context, in *Fini } func (c *clientApplicationClient) Reset(ctx context.Context, in *ResetRequest, opts ...grpc.CallOption) (*ResetResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(ResetResponse) - err := c.cc.Invoke(ctx, ClientApplication_Reset_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ClientApplication_Reset_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -269,8 +272,9 @@ func (c *clientApplicationClient) Reset(ctx context.Context, in *ResetRequest, o } func (c *clientApplicationClient) OnboardDevice(ctx context.Context, in *OnboardDeviceRequest, opts ...grpc.CallOption) (*OnboardDeviceResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(OnboardDeviceResponse) - err := c.cc.Invoke(ctx, ClientApplication_OnboardDevice_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ClientApplication_OnboardDevice_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -278,8 +282,9 @@ func (c *clientApplicationClient) OnboardDevice(ctx context.Context, in *Onboard } func (c *clientApplicationClient) OffboardDevice(ctx context.Context, in *OffboardDeviceRequest, opts ...grpc.CallOption) (*OffboardDeviceResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(OffboardDeviceResponse) - err := c.cc.Invoke(ctx, ClientApplication_OffboardDevice_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, ClientApplication_OffboardDevice_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -288,9 +293,9 @@ func (c *clientApplicationClient) OffboardDevice(ctx context.Context, in *Offboa // ClientApplicationServer is the server API for ClientApplication service. // All implementations must embed UnimplementedClientApplicationServer -// for forward compatibility +// for forward compatibility. type ClientApplicationServer interface { - GetDevices(*GetDevicesRequest, ClientApplication_GetDevicesServer) error + GetDevices(*GetDevicesRequest, grpc.ServerStreamingServer[pb.Device]) error GetDevice(context.Context, *GetDeviceRequest) (*pb.Device, error) GetDeviceResourceLinks(context.Context, *GetDeviceResourceLinksRequest) (*events.ResourceLinksPublished, error) GetResource(context.Context, *GetResourceRequest) (*pb.Resource, error) @@ -312,11 +317,14 @@ type ClientApplicationServer interface { mustEmbedUnimplementedClientApplicationServer() } -// UnimplementedClientApplicationServer must be embedded to have forward compatible implementations. -type UnimplementedClientApplicationServer struct { -} +// UnimplementedClientApplicationServer must be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedClientApplicationServer struct{} -func (UnimplementedClientApplicationServer) GetDevices(*GetDevicesRequest, ClientApplication_GetDevicesServer) error { +func (UnimplementedClientApplicationServer) GetDevices(*GetDevicesRequest, grpc.ServerStreamingServer[pb.Device]) error { return status.Errorf(codes.Unimplemented, "method GetDevices not implemented") } func (UnimplementedClientApplicationServer) GetDevice(context.Context, *GetDeviceRequest) (*pb.Device, error) { @@ -374,6 +382,7 @@ func (UnimplementedClientApplicationServer) OffboardDevice(context.Context, *Off return nil, status.Errorf(codes.Unimplemented, "method OffboardDevice not implemented") } func (UnimplementedClientApplicationServer) mustEmbedUnimplementedClientApplicationServer() {} +func (UnimplementedClientApplicationServer) testEmbeddedByValue() {} // UnsafeClientApplicationServer may be embedded to opt out of forward compatibility for this service. // Use of this interface is not recommended, as added methods to ClientApplicationServer will @@ -383,6 +392,13 @@ type UnsafeClientApplicationServer interface { } func RegisterClientApplicationServer(s grpc.ServiceRegistrar, srv ClientApplicationServer) { + // If the following call pancis, it indicates UnimplementedClientApplicationServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } s.RegisterService(&ClientApplication_ServiceDesc, srv) } @@ -391,21 +407,11 @@ func _ClientApplication_GetDevices_Handler(srv interface{}, stream grpc.ServerSt if err := stream.RecvMsg(m); err != nil { return err } - return srv.(ClientApplicationServer).GetDevices(m, &clientApplicationGetDevicesServer{stream}) -} - -type ClientApplication_GetDevicesServer interface { - Send(*pb.Device) error - grpc.ServerStream + return srv.(ClientApplicationServer).GetDevices(m, &grpc.GenericServerStream[GetDevicesRequest, pb.Device]{ServerStream: stream}) } -type clientApplicationGetDevicesServer struct { - grpc.ServerStream -} - -func (x *clientApplicationGetDevicesServer) Send(m *pb.Device) error { - return x.ServerStream.SendMsg(m) -} +// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. +type ClientApplication_GetDevicesServer = grpc.ServerStreamingServer[pb.Device] func _ClientApplication_GetDevice_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(GetDeviceRequest) diff --git a/pb/update_resource.pb.go b/pb/update_resource.pb.go index 015d6b65..de114735 100644 --- a/pb/update_resource.pb.go +++ b/pb/update_resource.pb.go @@ -16,8 +16,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 -// protoc v4.25.1 +// protoc-gen-go v1.34.2 +// protoc v5.27.3 // source: github.com/plgd-dev/client-application/pb/update_resource.proto package pb @@ -144,7 +144,7 @@ func file_github_com_plgd_dev_client_application_pb_update_resource_proto_rawDes } var file_github_com_plgd_dev_client_application_pb_update_resource_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_plgd_dev_client_application_pb_update_resource_proto_goTypes = []interface{}{ +var file_github_com_plgd_dev_client_application_pb_update_resource_proto_goTypes = []any{ (*UpdateResourceRequest)(nil), // 0: service.pb.UpdateResourceRequest (*commands.ResourceId)(nil), // 1: resourceaggregate.pb.ResourceId (*pb.Content)(nil), // 2: grpcgateway.pb.Content @@ -165,7 +165,7 @@ func file_github_com_plgd_dev_client_application_pb_update_resource_proto_init() return } if !protoimpl.UnsafeEnabled { - file_github_com_plgd_dev_client_application_pb_update_resource_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_github_com_plgd_dev_client_application_pb_update_resource_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*UpdateResourceRequest); i { case 0: return &v.state diff --git a/service/config/remoteProvisioning/config.go b/service/config/remoteProvisioning/config.go index 65fe6c08..d8cd8012 100644 --- a/service/config/remoteProvisioning/config.go +++ b/service/config/remoteProvisioning/config.go @@ -20,6 +20,7 @@ import ( "time" "github.com/plgd-dev/client-application/pb" + grpcgwPb "github.com/plgd-dev/hub/v2/grpc-gateway/pb" ) type Config = pb.RemoteProvisioning @@ -30,8 +31,9 @@ var defaultConfig = Config{ CsrChallengeStateExpiration: time.Minute.Nanoseconds(), }, JwtOwnerClaim: "sub", - WebOauthClient: &pb.WebOauthClient{}, - DeviceOauthClient: &pb.DeviceOauthClient{}, + WebOauthClient: &grpcgwPb.OAuthClient{}, + DeviceOauthClient: &grpcgwPb.OAuthClient{}, + M2MOauthClient: &grpcgwPb.OAuthClient{}, } func DefaultConfig() *Config { diff --git a/service/grpc/device.go b/service/grpc/device.go index e8f1d4c9..d4049d6f 100644 --- a/service/grpc/device.go +++ b/service/grpc/device.go @@ -19,6 +19,7 @@ package grpc import ( "context" "fmt" + "slices" "sort" "sync" "time" @@ -34,7 +35,6 @@ import ( "github.com/plgd-dev/device/v2/schema/resources" grpcgwPb "github.com/plgd-dev/hub/v2/grpc-gateway/pb" "github.com/plgd-dev/hub/v2/pkg/log" - "github.com/plgd-dev/hub/v2/pkg/strings" "github.com/plgd-dev/hub/v2/resource-aggregate/commands" "github.com/plgd-dev/hub/v2/resource-aggregate/events" "google.golang.org/grpc/codes" @@ -184,7 +184,7 @@ func (d *device) getResourceLinkAndCheckAccess(ctx context.Context, resourceID * if err != nil { return link, err } - if strings.Contains(link.ResourceTypes, resources.ResourceType) && resInterface == interfaces.OC_IF_B { + if slices.Contains(link.ResourceTypes, resources.ResourceType) && resInterface == interfaces.OC_IF_B { link.Endpoints = link.Endpoints.FilterSecureEndpoints() } return link, d.checkAccess(link) diff --git a/service/grpc/getDevices.go b/service/grpc/getDevices.go index 91c940d6..2435b38d 100644 --- a/service/grpc/getDevices.go +++ b/service/grpc/getDevices.go @@ -22,6 +22,7 @@ import ( "fmt" "io" "net" + "slices" "strings" "sync" "time" @@ -44,7 +45,6 @@ import ( "github.com/plgd-dev/go-coap/v3/udp/client" grpcgwPb "github.com/plgd-dev/hub/v2/grpc-gateway/pb" "github.com/plgd-dev/hub/v2/pkg/log" - pkgStrings "github.com/plgd-dev/hub/v2/pkg/strings" "github.com/plgd-dev/hub/v2/resource-aggregate/commands" "github.com/plgd-dev/kit/v2/codec/cbor" pkgNet "github.com/plgd-dev/kit/v2/net" @@ -147,12 +147,12 @@ func getDeviceInfoFromLinks(links schema.ResourceLinks) map[string]*deviceInfo { } devices[l.GetDeviceID()] = d } - if pkgStrings.Contains(l.ResourceTypes, plgdDevice.ResourceType) { + if slices.Contains(l.ResourceTypes, plgdDevice.ResourceType) { d.endpoints = l.Endpoints d.resourceTypes = l.ResourceTypes d.deviceURI = l.Href } - if pkgStrings.Contains(l.ResourceTypes, doxm.ResourceType) { + if slices.Contains(l.ResourceTypes, doxm.ResourceType) { d.ownershipStatus = getOwnershipStatus(l) } } diff --git a/service/grpc/getResource.go b/service/grpc/getResource.go index 23523c48..c413771f 100644 --- a/service/grpc/getResource.go +++ b/service/grpc/getResource.go @@ -19,6 +19,7 @@ package grpc import ( "context" "fmt" + "slices" "github.com/plgd-dev/client-application/pb" "github.com/plgd-dev/client-application/pkg/rawcodec" @@ -27,7 +28,6 @@ import ( plgdDevice "github.com/plgd-dev/device/v2/schema/device" "github.com/plgd-dev/go-coap/v3/message" grpcgwPb "github.com/plgd-dev/hub/v2/grpc-gateway/pb" - "github.com/plgd-dev/hub/v2/pkg/strings" "github.com/plgd-dev/hub/v2/resource-aggregate/commands" "github.com/plgd-dev/hub/v2/resource-aggregate/events" "google.golang.org/grpc/codes" @@ -47,7 +47,7 @@ func getResourceAndRefreshCache(ctx context.Context, dev *device, link schema.Re } content := responseToData(response) // we update device resource body only for device resource - if strings.Contains(link.ResourceTypes, plgdDevice.ResourceType) && resourceInterface == "" { + if slices.Contains(link.ResourceTypes, plgdDevice.ResourceType) && resourceInterface == "" { dev.updateDeviceResourceBody(content) } return content, nil diff --git a/test/test.go b/test/test.go index ea6fc22c..0dcf5b65 100644 --- a/test/test.go +++ b/test/test.go @@ -213,14 +213,14 @@ func NewRemoteProvisioningConfig() *pb.RemoteProvisioning { CsrChallengeStateExpiration: (time.Minute * 10).Nanoseconds(), }, CertificateAuthority: "https://" + testConfig.CERTIFICATE_AUTHORITY_HOST, - WebOauthClient: &pb.WebOauthClient{ + WebOauthClient: &grpcgwPb.OAuthClient{ ClientId: testConfig.OAUTH_MANAGER_CLIENT_ID, Scopes: []string{"openid"}, }, JwtOwnerClaim: testConfig.OWNER_CLAIM, Authority: "https://" + testConfig.OAUTH_SERVER_HOST, CoapGateway: testConfig.ACTIVE_COAP_SCHEME + "://" + testConfig.COAP_GW_HOST, - DeviceOauthClient: &pb.DeviceOauthClient{ + DeviceOauthClient: &grpcgwPb.OAuthClient{ ClientId: testConfig.OAUTH_MANAGER_CLIENT_ID, ProviderName: testConfig.DEVICE_PROVIDER, Audience: "http://" + CLIENT_APPLICATION_HTTP_HOST,