Skip to content

Commit dfd4378

Browse files
authored
Merge pull request #1681 from lindseysimple/issue-1677
fix: Remove the deprecated AddRoute function
2 parents 210628a + 49cf395 commit dfd4378

File tree

6 files changed

+179
-101
lines changed

6 files changed

+179
-101
lines changed

app-service-template/go.mod

+14-14
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ replace github.com/edgexfoundry/app-functions-sdk-go/v4 => ../
1010

1111
require (
1212
github.com/edgexfoundry/app-functions-sdk-go/v4 v4.0.0
13-
github.com/edgexfoundry/go-mod-core-contracts/v4 v4.0.0-dev.26
13+
github.com/edgexfoundry/go-mod-core-contracts/v4 v4.0.0-dev.28
1414
github.com/google/uuid v1.6.0
1515
github.com/labstack/echo/v4 v4.13.3
1616
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475
@@ -24,13 +24,13 @@ require (
2424
github.com/blang/semver/v4 v4.0.0 // indirect
2525
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
2626
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
27-
github.com/diegoholiveira/jsonlogic/v3 v3.7.3 // indirect
27+
github.com/diegoholiveira/jsonlogic/v3 v3.7.4 // indirect
2828
github.com/eclipse/paho.mqtt.golang v1.5.0 // indirect
29-
github.com/edgexfoundry/go-mod-bootstrap/v4 v4.0.0-dev.26 // indirect
30-
github.com/edgexfoundry/go-mod-configuration/v4 v4.0.0-dev.12 // indirect
31-
github.com/edgexfoundry/go-mod-messaging/v4 v4.0.0-dev.17 // indirect
32-
github.com/edgexfoundry/go-mod-registry/v4 v4.0.0-dev.3 // indirect
33-
github.com/edgexfoundry/go-mod-secrets/v4 v4.0.0-dev.5 // indirect
29+
github.com/edgexfoundry/go-mod-bootstrap/v4 v4.0.0-dev.28 // indirect
30+
github.com/edgexfoundry/go-mod-configuration/v4 v4.0.0-dev.14 // indirect
31+
github.com/edgexfoundry/go-mod-messaging/v4 v4.0.0-dev.18 // indirect
32+
github.com/edgexfoundry/go-mod-registry/v4 v4.0.0-dev.4 // indirect
33+
github.com/edgexfoundry/go-mod-secrets/v4 v4.0.0-dev.10 // indirect
3434
github.com/fsnotify/fsnotify v1.7.0 // indirect
3535
github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa // indirect
3636
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
@@ -108,21 +108,21 @@ require (
108108
github.com/sirupsen/logrus v1.9.3 // indirect
109109
github.com/speps/go-hashids v2.0.0+incompatible // indirect
110110
github.com/spf13/cast v1.7.1 // indirect
111-
github.com/spiffe/go-spiffe/v2 v2.4.0 // indirect
111+
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
112112
github.com/stretchr/objx v0.5.2 // indirect
113113
github.com/tklauser/go-sysconf v0.3.12 // indirect
114114
github.com/tklauser/numcpus v0.6.1 // indirect
115115
github.com/valyala/bytebufferpool v1.0.0 // indirect
116116
github.com/valyala/fasttemplate v1.2.2 // indirect
117117
github.com/x448/float16 v0.8.4 // indirect
118118
github.com/yusufpapurcu/wmi v1.2.4 // indirect
119-
github.com/zeebo/errs v1.3.0 // indirect
119+
github.com/zeebo/errs v1.4.0 // indirect
120120
github.com/zitadel/oidc/v2 v2.12.2 // indirect
121121
go.mongodb.org/mongo-driver v1.17.0 // indirect
122122
go.mozilla.org/pkcs7 v0.9.0 // indirect
123-
go.opentelemetry.io/otel v1.29.0 // indirect
124-
go.opentelemetry.io/otel/metric v1.29.0 // indirect
125-
go.opentelemetry.io/otel/trace v1.29.0 // indirect
123+
go.opentelemetry.io/otel v1.32.0 // indirect
124+
go.opentelemetry.io/otel/metric v1.32.0 // indirect
125+
go.opentelemetry.io/otel/trace v1.32.0 // indirect
126126
golang.org/x/crypto v0.32.0 // indirect
127127
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
128128
golang.org/x/net v0.34.0 // indirect
@@ -132,8 +132,8 @@ require (
132132
golang.org/x/term v0.28.0 // indirect
133133
golang.org/x/text v0.21.0 // indirect
134134
golang.org/x/time v0.8.0 // indirect
135-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
136-
google.golang.org/grpc v1.67.1 // indirect
135+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a // indirect
136+
google.golang.org/grpc v1.70.0 // indirect
137137
google.golang.org/protobuf v1.36.3 // indirect
138138
gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect
139139
gopkg.in/yaml.v3 v3.0.1 // indirect

app-service-template/go.sum

+34-30
Original file line numberDiff line numberDiff line change
@@ -70,22 +70,22 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
7070
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
7171
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
7272
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
73-
github.com/diegoholiveira/jsonlogic/v3 v3.7.3 h1:orvGaTW5Qdcowpr7vgfMNuqYNjQYcqtw9W1Bk4QyI38=
74-
github.com/diegoholiveira/jsonlogic/v3 v3.7.3/go.mod h1:OYRb6FSTVmMM+MNQ7ElmMsczyNSepw+OU4Z8emDSi4w=
73+
github.com/diegoholiveira/jsonlogic/v3 v3.7.4 h1:92HSmB9bwM/o0ZvrCpcvTP2EsPXSkKtAniIr2W/dcIM=
74+
github.com/diegoholiveira/jsonlogic/v3 v3.7.4/go.mod h1:OYRb6FSTVmMM+MNQ7ElmMsczyNSepw+OU4Z8emDSi4w=
7575
github.com/eclipse/paho.mqtt.golang v1.5.0 h1:EH+bUVJNgttidWFkLLVKaQPGmkTUfQQqjOsyvMGvD6o=
7676
github.com/eclipse/paho.mqtt.golang v1.5.0/go.mod h1:du/2qNQVqJf/Sqs4MEL77kR8QTqANF7XU7Fk0aOTAgk=
77-
github.com/edgexfoundry/go-mod-bootstrap/v4 v4.0.0-dev.26 h1:59f5u/cEj/P2Dd0BDqD0i2hBirODpvO9+hV6NdlxhUw=
78-
github.com/edgexfoundry/go-mod-bootstrap/v4 v4.0.0-dev.26/go.mod h1:o6qcqfq0ihA8RYs7FZldrslEeMIXK6XiHJg0fxF7GRA=
79-
github.com/edgexfoundry/go-mod-configuration/v4 v4.0.0-dev.12 h1:2P7kCcGMd5BX9NFubHxfZ+Q19Q0ctMwh11rgSyPT5uc=
80-
github.com/edgexfoundry/go-mod-configuration/v4 v4.0.0-dev.12/go.mod h1:sx5Zx+zAhmlFRNK2EblvOnCuUc099F2mHLWtZGfoWB8=
81-
github.com/edgexfoundry/go-mod-core-contracts/v4 v4.0.0-dev.26 h1:sLzjJnQDukzo6+tRn0coHH+vIMK+L8NL53TWiy5MGbs=
82-
github.com/edgexfoundry/go-mod-core-contracts/v4 v4.0.0-dev.26/go.mod h1:D35HIMZkFFy82shKtPYaEL3Nn+ZNEjUjZI1RLn1j23E=
83-
github.com/edgexfoundry/go-mod-messaging/v4 v4.0.0-dev.17 h1:oov5bnY/KE+EY1Bj6OtYHFBcxi7dcuAquhgB2bM5gEY=
84-
github.com/edgexfoundry/go-mod-messaging/v4 v4.0.0-dev.17/go.mod h1:m+qXuNmDEOpIwjYcXd2dlI36wgSyB/bTEfx+/o9hc+8=
85-
github.com/edgexfoundry/go-mod-registry/v4 v4.0.0-dev.3 h1:6tw6JqEJDOqo2lEgxjZ+scvsub5R20WGpInCuoxS6zE=
86-
github.com/edgexfoundry/go-mod-registry/v4 v4.0.0-dev.3/go.mod h1:QpZW5bWxsk0Leh1nvgojBZrpHA/B6dSw6LgT0zxh9hg=
87-
github.com/edgexfoundry/go-mod-secrets/v4 v4.0.0-dev.5 h1:PnbvMnedIlbqXsnUp2+i18BJ9e6CJ7GzwNA9vjPU3Jk=
88-
github.com/edgexfoundry/go-mod-secrets/v4 v4.0.0-dev.5/go.mod h1:zAIZIOlTbX7KUZlNF1ylx8pKV16ld/7hmyjpFLiDSKo=
77+
github.com/edgexfoundry/go-mod-bootstrap/v4 v4.0.0-dev.28 h1:DmwT+FZlKms2wKdqBw8wAdn4PoMZT5R7TCxAxfyovfg=
78+
github.com/edgexfoundry/go-mod-bootstrap/v4 v4.0.0-dev.28/go.mod h1:W22AZ7peC6DLN8QKdDhEFaiiL9NFQfk2Hslp/IySqdU=
79+
github.com/edgexfoundry/go-mod-configuration/v4 v4.0.0-dev.14 h1:A2LI3YVXGqZS0myTiBrNMFIqIWbH0rNNmLsDPHeI1RM=
80+
github.com/edgexfoundry/go-mod-configuration/v4 v4.0.0-dev.14/go.mod h1:Sj4PTuZJI5bjQvFh8rz0U1egEu+jkEnlWoHXXUYjgXs=
81+
github.com/edgexfoundry/go-mod-core-contracts/v4 v4.0.0-dev.28 h1:eli2uheGD7d5qMDFPzNhm3fAEyoDLTgqKWQoDacaF8A=
82+
github.com/edgexfoundry/go-mod-core-contracts/v4 v4.0.0-dev.28/go.mod h1:D35HIMZkFFy82shKtPYaEL3Nn+ZNEjUjZI1RLn1j23E=
83+
github.com/edgexfoundry/go-mod-messaging/v4 v4.0.0-dev.18 h1:gTaPm8iwdVO0vi8TLuNRYaeNno46Nm6+S04OpubBLlk=
84+
github.com/edgexfoundry/go-mod-messaging/v4 v4.0.0-dev.18/go.mod h1:h7it/lhC7QhcLKW+KA+D9mCd8Ng3GxT8kSegZMrdEFM=
85+
github.com/edgexfoundry/go-mod-registry/v4 v4.0.0-dev.4 h1:/IZtXURVZXSKaxHEWVSYHXrNJqoVk2n6OcUR+GmPbgw=
86+
github.com/edgexfoundry/go-mod-registry/v4 v4.0.0-dev.4/go.mod h1:S5wQ050kYTbZebHqdCC48ojiRghSfnzNLnJLo+FWZH0=
87+
github.com/edgexfoundry/go-mod-secrets/v4 v4.0.0-dev.10 h1:TU9OBsMeroavoC6Sej8FTTs1scjBhjEHdKrJ5iGHYl8=
88+
github.com/edgexfoundry/go-mod-secrets/v4 v4.0.0-dev.10/go.mod h1:7L7xJTUayyswdvZNI2GkFZKq7Q33aIn3YyqjBB3L3TI=
8989
github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
9090
github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
9191
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -188,6 +188,8 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
188188
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
189189
github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
190190
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
191+
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
192+
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
191193
github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0=
192194
github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
193195
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
@@ -441,8 +443,8 @@ github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t6
441443
github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
442444
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
443445
github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns=
444-
github.com/spiffe/go-spiffe/v2 v2.4.0 h1:j/FynG7hi2azrBG5cvjRcnQ4sux/VNj8FAVc99Fl66c=
445-
github.com/spiffe/go-spiffe/v2 v2.4.0/go.mod h1:m5qJ1hGzjxjtrkGHZupoXHo/FDWwCB1MdSyBzfHugx0=
446+
github.com/spiffe/go-spiffe/v2 v2.5.0 h1:N2I01KCUkv1FAjZXJMwh95KK1ZIQLYbPfhaxw8WS0hE=
447+
github.com/spiffe/go-spiffe/v2 v2.5.0/go.mod h1:P+NxobPc6wXhVtINNtFjNWGBTreew1GBUCwT2wPmb7g=
446448
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
447449
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
448450
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
@@ -473,8 +475,8 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1
473475
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
474476
github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
475477
github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
476-
github.com/zeebo/errs v1.3.0 h1:hmiaKqgYZzcVgRL1Vkc1Mn2914BbzB0IBxs+ebeutGs=
477-
github.com/zeebo/errs v1.3.0/go.mod h1:sgbWHsvVuTPHcqJJGQ1WhI5KbWlHYz+2+2C/LSEtCw4=
478+
github.com/zeebo/errs v1.4.0 h1:XNdoD/RRMKP7HD0UhJnIzUy74ISdGGxURlYG8HSWSfM=
479+
github.com/zeebo/errs v1.4.0/go.mod h1:sgbWHsvVuTPHcqJJGQ1WhI5KbWlHYz+2+2C/LSEtCw4=
478480
github.com/zitadel/oidc/v2 v2.12.2 h1:3kpckg4rurgw7w7aLJrq7yvRxb2pkNOtD08RH42vPEs=
479481
github.com/zitadel/oidc/v2 v2.12.2/go.mod h1:vhP26g1g4YVntcTi0amMYW3tJuid70nxqxf+kb6XKgg=
480482
go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
@@ -491,14 +493,16 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
491493
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
492494
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
493495
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
494-
go.opentelemetry.io/otel v1.29.0 h1:PdomN/Al4q/lN6iBJEN3AwPvUiHPMlt93c8bqTG5Llw=
495-
go.opentelemetry.io/otel v1.29.0/go.mod h1:N/WtXPs1CNCUEx+Agz5uouwCba+i+bJGFicT8SR4NP8=
496-
go.opentelemetry.io/otel/metric v1.29.0 h1:vPf/HFWTNkPu1aYeIsc98l4ktOQaL6LeSoeV2g+8YLc=
497-
go.opentelemetry.io/otel/metric v1.29.0/go.mod h1:auu/QWieFVWx+DmQOUMgj0F8LHWdgalxXqvp7BII/W8=
498-
go.opentelemetry.io/otel/sdk v1.24.0 h1:YMPPDNymmQN3ZgczicBY3B6sf9n62Dlj9pWD3ucgoDw=
499-
go.opentelemetry.io/otel/sdk v1.24.0/go.mod h1:KVrIYw6tEubO9E96HQpcmpTKDVn9gdv35HoYiQWGDFg=
500-
go.opentelemetry.io/otel/trace v1.29.0 h1:J/8ZNK4XgR7a21DZUAsbF8pZ5Jcw1VhACmnYt39JTi4=
501-
go.opentelemetry.io/otel/trace v1.29.0/go.mod h1:eHl3w0sp3paPkYstJOmAimxhiFXPg+MMTlEh3nsQgWQ=
496+
go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U=
497+
go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg=
498+
go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M=
499+
go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8=
500+
go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4=
501+
go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU=
502+
go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiyYCU9snn1CU=
503+
go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ=
504+
go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM=
505+
go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8=
502506
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
503507
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
504508
go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
@@ -830,8 +834,8 @@ google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6D
830834
google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
831835
google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
832836
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
833-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 h1:e7S5W7MGGLaSu8j3YjdezkZ+m1/Nm0uRVRMEMGk26Xs=
834-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
837+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a h1:hgh8P4EuoxpsuKMXX/To36nOFD7vixReXgn8lPGnt+o=
838+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU=
835839
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
836840
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
837841
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@@ -852,8 +856,8 @@ google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG
852856
google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
853857
google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
854858
google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
855-
google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
856-
google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
859+
google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ=
860+
google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw=
857861
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
858862
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
859863
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

internal/app/service.go

-12
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"context"
2222
"errors"
2323
"fmt"
24-
nethttp "net/http"
2524
"os"
2625
"os/signal"
2726
"reflect"
@@ -30,8 +29,6 @@ import (
3029
"syscall"
3130
"time"
3231

33-
"github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/utils"
34-
3532
bootstrapHandlers "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/handlers"
3633
"github.com/edgexfoundry/go-mod-core-contracts/v4/dtos"
3734
"github.com/edgexfoundry/go-mod-messaging/v4/pkg/types"
@@ -129,16 +126,7 @@ func (svc *Service) AppContext() context.Context {
129126
return svc.ctx.appCtx
130127
}
131128

132-
// AddRoute allows you to leverage the existing webserver to add routes.
133-
// DEPRECATED - Use AddCustomRoute
134-
// TODO: Remove in 4.0
135-
func (svc *Service) AddRoute(route string, handler func(nethttp.ResponseWriter, *nethttp.Request), methods ...string) error {
136-
// Legacy behavior is to add unauthenticated route
137-
return svc.AddCustomRoute(route, interfaces.Unauthenticated, utils.WrapHandler(handler), methods...)
138-
}
139-
140129
// AddCustomRoute allows you to leverage the existing webserver to add routes.
141-
// TODO: Change signature in 4.0 to use "handler echo.HandlerFunc" once addContext is removed
142130
func (svc *Service) AddCustomRoute(route string, authentication interfaces.Authentication, handler echo.HandlerFunc, methods ...string) error {
143131
if route == coreCommon.ApiPingRoute ||
144132
route == coreCommon.ApiConfigRoute ||

internal/app/service_test.go

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
//
22
// Copyright (c) 2023 Intel Corporation
3+
// Copyright (C) 2025 IOTech Ltd
34
//
45
// Licensed under the Apache License, Version 2.0 (the "License");
56
// you may not use this file except in compliance with the License.
@@ -94,14 +95,6 @@ func IsInstanceOf(objectPtr, typePtr interface{}) bool {
9495
return reflect.TypeOf(objectPtr) == reflect.TypeOf(typePtr)
9596
}
9697

97-
func TestAddRoute(t *testing.T) {
98-
sdk, router := createSdkAndRouter()
99-
expectedPath := "/test"
100-
101-
_ = sdk.AddRoute(expectedPath, func(http.ResponseWriter, *http.Request) {}, http.MethodGet)
102-
verifyPath(t, expectedPath, router)
103-
}
104-
10598
func TestAddCustomRouteUnauthenticated(t *testing.T) {
10699
sdk, router := createSdkAndRouter()
107100
expectedPath := "/test"

0 commit comments

Comments
 (0)