diff --git a/Makefile b/Makefile index 9326f90b9..8c851dd85 100644 --- a/Makefile +++ b/Makefile @@ -17,8 +17,8 @@ MICROSERVICES=example/cmd/device-simple/device-simple VERSION=$(shell cat ./VERSION 2>/dev/null || echo 0.0.0) DOCKER_TAG=$(VERSION)-dev -GOFLAGS=-ldflags "-X github.com/edgexfoundry/device-sdk-go/v2.Version=$(VERSION)" -trimpath -mod=readonly -CGOFLAGS=-ldflags "-linkmode=external -X github.com/edgexfoundry/device-sdk-go/v2.Version=$(VERSION)" -trimpath -mod=readonly -buildmode=pie +GOFLAGS=-ldflags "-X github.com/edgexfoundry/device-sdk-go/v3.Version=$(VERSION)" -trimpath -mod=readonly +CGOFLAGS=-ldflags "-linkmode=external -X github.com/edgexfoundry/device-sdk-go/v3.Version=$(VERSION)" -trimpath -mod=readonly -buildmode=pie GOTESTFLAGS?=-race GIT_SHA=$(shell git rev-parse HEAD) diff --git a/example/cmd/device-simple/Attribution.txt b/example/cmd/device-simple/Attribution.txt index 17db3d34a..e7fc2e866 100644 --- a/example/cmd/device-simple/Attribution.txt +++ b/example/cmd/device-simple/Attribution.txt @@ -45,11 +45,11 @@ https://github.com/cenkalti/backoff/blob/v3/LICENSE davecgh/go-spew (ISC) https://github.com/davecgh/go-spew https://github.com/davecgh/go-spew/blob/master/LICENSE -edgexfoundry/go-mod-core-contracts (Apache 2.0) https://github.com/edgexfoundry/go-mod-core-contracts/v2 -https://github.com/edgexfoundry/go-mod-core-contracts/v2/blob/master/LICENSE +edgexfoundry/go-mod-core-contracts (Apache 2.0) https://github.com/edgexfoundry/go-mod-core-contracts/v3 +https://github.com/edgexfoundry/go-mod-core-contracts/v3/blob/master/LICENSE -edgexfoundry/go-mod-registry (Apache 2.0) https://github.com/edgexfoundry/go-mod-registry/v2 -https://github.com/edgexfoundry/go-mod-registry/v2/blob/master/LICENSE +edgexfoundry/go-mod-registry (Apache 2.0) https://github.com/edgexfoundry/go-mod-registry/v3 +https://github.com/edgexfoundry/go-mod-registry/v3/blob/master/LICENSE go-logfmt/logfmt (MIT) https://github.com/go-logfmt/logfmt https://github.com/go-logfmt/logfmt/blob/master/LICENSE @@ -78,8 +78,8 @@ https://github.com/kr/logfmt/blob/master/Readme hashicorp/consul/api (Mozilla Public License 2.0) https://github.com/hashicorp/consul/api https://github.com/hashicorp/consul/blob/master/LICENSE -edgexfoundry/go-mod-bootstrap (Apache 2.0) https://github.com/edgexfoundry/go-mod-bootstrap/v2 -https://github.com/edgexfoundry/go-mod-bootstrap/v2/blob/master/LICENSE +edgexfoundry/go-mod-bootstrap (Apache 2.0) https://github.com/edgexfoundry/go-mod-bootstrap/v3 +https://github.com/edgexfoundry/go-mod-bootstrap/v3/blob/master/LICENSE edgexfoundry/go-mod-secrets (Apache 2.0) https://github.com/edgexfoundry/go-mod-secrets/v2 https://github.com/edgexfoundry/go-mod-secrets/v2/blob/master/LICENSE @@ -129,7 +129,7 @@ https://github.com/golang/sys/blob/master/LICENSE eclipse/paho.mqtt.golang (Eclipse Public License 2.0) https://github.com/eclipse/paho.mqtt.golang https://github.com/eclipse/paho.mqtt.golang/blob/master/LICENSE -edgexfoundry/go-mod-messaging (Apache 2.0) https://github.com/edgexfoundry/go-mod-messaging/v2 +edgexfoundry/go-mod-messaging (Apache 2.0) https://github.com/edgexfoundry/go-mod-messaging/v3 https://github.com/edgexfoundry/go-mod-messaging/blob/master/LICENSE go-redis/redis (BSD-2) https://github.com/go-redis/redis/v7 diff --git a/example/cmd/device-simple/main.go b/example/cmd/device-simple/main.go index 867112999..9755102b5 100644 --- a/example/cmd/device-simple/main.go +++ b/example/cmd/device-simple/main.go @@ -9,9 +9,9 @@ package main import ( - "github.com/edgexfoundry/device-sdk-go/v2" - "github.com/edgexfoundry/device-sdk-go/v2/example/driver" - "github.com/edgexfoundry/device-sdk-go/v2/pkg/startup" + "github.com/edgexfoundry/device-sdk-go/v3" + "github.com/edgexfoundry/device-sdk-go/v3/example/driver" + "github.com/edgexfoundry/device-sdk-go/v3/pkg/startup" ) const ( diff --git a/example/driver/simpledriver.go b/example/driver/simpledriver.go index 67417722d..368341e40 100644 --- a/example/driver/simpledriver.go +++ b/example/driver/simpledriver.go @@ -7,7 +7,6 @@ // This package provides a simple example implementation of // ProtocolDriver interface. -// package driver import ( @@ -22,14 +21,14 @@ import ( "strconv" "time" - "github.com/edgexfoundry/device-sdk-go/v2/pkg/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/device-sdk-go/v3/pkg/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" gometrics "github.com/rcrowley/go-metrics" - "github.com/edgexfoundry/device-sdk-go/v2/example/config" - sdkModels "github.com/edgexfoundry/device-sdk-go/v2/pkg/models" + "github.com/edgexfoundry/device-sdk-go/v3/example/config" + sdkModels "github.com/edgexfoundry/device-sdk-go/v3/pkg/models" ) const readCommandsExecutedName = "ReadCommandsExecuted" diff --git a/go.mod b/go.mod index aac6671c6..8c381b6d5 100644 --- a/go.mod +++ b/go.mod @@ -1,14 +1,14 @@ -module github.com/edgexfoundry/device-sdk-go/v2 +module github.com/edgexfoundry/device-sdk-go/v3 go 1.18 require ( bitbucket.org/bertimus9/systemstat v0.5.0 github.com/OneOfOne/xxhash v1.2.8 - github.com/edgexfoundry/go-mod-bootstrap/v2 v2.3.0 - github.com/edgexfoundry/go-mod-core-contracts/v2 v2.3.0 - github.com/edgexfoundry/go-mod-messaging/v2 v2.3.0 - github.com/edgexfoundry/go-mod-registry/v2 v2.3.0 + github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.1 + github.com/edgexfoundry/go-mod-core-contracts/v3 v3.0.0-dev.2 + github.com/edgexfoundry/go-mod-messaging/v3 v3.0.0-dev.1 + github.com/edgexfoundry/go-mod-registry/v3 v3.0.0-dev.3 github.com/google/uuid v1.3.0 github.com/gorilla/mux v1.8.0 github.com/pelletier/go-toml v1.9.5 @@ -22,9 +22,9 @@ require ( github.com/armon/go-metrics v0.3.10 // indirect github.com/cenkalti/backoff v2.2.1+incompatible // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/eclipse/paho.mqtt.golang v1.4.1 // indirect - github.com/edgexfoundry/go-mod-configuration/v2 v2.3.0 // indirect - github.com/edgexfoundry/go-mod-secrets/v2 v2.3.0 // indirect + github.com/eclipse/paho.mqtt.golang v1.4.2 // indirect + github.com/edgexfoundry/go-mod-configuration/v3 v3.0.0-dev.2 // indirect + github.com/edgexfoundry/go-mod-secrets/v3 v3.0.0-dev.1 // indirect github.com/fatih/color v1.9.0 // indirect github.com/fxamacker/cbor/v2 v2.4.0 // indirect github.com/go-kit/log v0.2.1 // indirect @@ -35,7 +35,7 @@ require ( github.com/go-redis/redis/v7 v7.3.0 // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/gorilla/websocket v1.4.2 // indirect - github.com/hashicorp/consul/api v1.15.3 // indirect + github.com/hashicorp/consul/api v1.18.0 // indirect github.com/hashicorp/errwrap v1.0.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.1 // indirect github.com/hashicorp/go-hclog v0.14.1 // indirect @@ -43,7 +43,7 @@ require ( github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-rootcerts v1.0.2 // indirect github.com/hashicorp/golang-lru v0.5.4 // indirect - github.com/hashicorp/serf v0.9.7 // indirect + github.com/hashicorp/serf v0.10.1 // indirect github.com/leodido/go-urn v1.2.1 // indirect github.com/mattn/go-colorable v0.1.12 // indirect github.com/mattn/go-isatty v0.0.14 // indirect @@ -52,10 +52,9 @@ require ( github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mitchellh/reflectwalk v1.0.0 // indirect - github.com/nats-io/nats.go v1.18.0 // indirect + github.com/nats-io/nats.go v1.20.0 // indirect github.com/nats-io/nkeys v0.3.0 // indirect github.com/nats-io/nuid v1.0.1 // indirect - github.com/pebbe/zmq4 v1.2.7 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spiffe/go-spiffe/v2 v2.1.1 // indirect github.com/stretchr/objx v0.5.0 // indirect diff --git a/go.sum b/go.sum index ae0af177e..75335349c 100644 --- a/go.sum +++ b/go.sum @@ -43,20 +43,20 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/eclipse/paho.mqtt.golang v1.4.1 h1:tUSpviiL5G3P9SZZJPC4ZULZJsxQKXxfENpMvdbAXAI= -github.com/eclipse/paho.mqtt.golang v1.4.1/go.mod h1:JGt0RsEwEX+Xa/agj90YJ9d9DH2b7upDZMK9HRbFvCA= -github.com/edgexfoundry/go-mod-bootstrap/v2 v2.3.0 h1:NCOc5bOz6oX+KuOcv0Rt6BTSDShbg4VmCapXO19IoCM= -github.com/edgexfoundry/go-mod-bootstrap/v2 v2.3.0/go.mod h1:jWZjsy0BaO6+S+Tq111mcrkGKpg6bhTyqngyYcl+70E= -github.com/edgexfoundry/go-mod-configuration/v2 v2.3.0 h1:VeK7VBiNc/RIR7HXC0ya3fWCmcFQzrSLITPYn87cQsA= -github.com/edgexfoundry/go-mod-configuration/v2 v2.3.0/go.mod h1:1tKJhcPEWftFy+I4n7+sNIBOo7H5ys/QaPvyXl0tMtc= -github.com/edgexfoundry/go-mod-core-contracts/v2 v2.3.0 h1:8Svk1HTehXEgwxgyA4muVhSkP3D9n1q+oSHI3B1Ac90= -github.com/edgexfoundry/go-mod-core-contracts/v2 v2.3.0/go.mod h1:4/e61acxVkhQWCTjQ4XcHVJDnrMDloFsZZB1B6STCRw= -github.com/edgexfoundry/go-mod-messaging/v2 v2.3.0 h1:aZfDYjj6n2Lo1P1t6NKuShhHjzFk9/mQV9nuJS3ioZ4= -github.com/edgexfoundry/go-mod-messaging/v2 v2.3.0/go.mod h1:5pFRG0iJ64ulFdvwYMbnyD94ciS+Va4h3bpK2P4CBk0= -github.com/edgexfoundry/go-mod-registry/v2 v2.3.0 h1:QEZvYSDkQKAo6WVFrjBkQjjfpbn045Lsv4gNdgATgeM= -github.com/edgexfoundry/go-mod-registry/v2 v2.3.0/go.mod h1:Gyx8a+7jfzy53ljq9kgiz553xhgYYKNNWhnaTn76i+g= -github.com/edgexfoundry/go-mod-secrets/v2 v2.3.0 h1:MRehbe0ZdIP2jx3Nv18LktENlWdXSmw0E6x6VKvFOfo= -github.com/edgexfoundry/go-mod-secrets/v2 v2.3.0/go.mod h1:y9l/5p0EEA2IBf2ctvJ0PtjTN/XPab5BWnfIi3Sy6C4= +github.com/eclipse/paho.mqtt.golang v1.4.2 h1:66wOzfUHSSI1zamx7jR6yMEI5EuHnT1G6rNA5PM12m4= +github.com/eclipse/paho.mqtt.golang v1.4.2/go.mod h1:JGt0RsEwEX+Xa/agj90YJ9d9DH2b7upDZMK9HRbFvCA= +github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.1 h1:4Vgy7BJt1oLgLGBm97ePCzNIVxF08NcNYpTHqnOih5o= +github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.1/go.mod h1:hap7XdFAmfYRLRLn5H4Ebr97OlIpEvIpxSiGVR3CLig= +github.com/edgexfoundry/go-mod-configuration/v3 v3.0.0-dev.2 h1:xp5MsP+qf/fuJxy8fT7k1N+c4j4C6w04qMCBXm6id7o= +github.com/edgexfoundry/go-mod-configuration/v3 v3.0.0-dev.2/go.mod h1:1Vv4uWAo6r7k6jUlqVJW8JOL6YKVBc6sRL8Al3DrMck= +github.com/edgexfoundry/go-mod-core-contracts/v3 v3.0.0-dev.2 h1:tleTxhbBISfDNn596rU71n+GOy27dMIme+v8Vl0uhpw= +github.com/edgexfoundry/go-mod-core-contracts/v3 v3.0.0-dev.2/go.mod h1:7RwSq896VqelvSU7zYKs2tpZhgELVFECkiGf6XGLKfQ= +github.com/edgexfoundry/go-mod-messaging/v3 v3.0.0-dev.1 h1:TxRYbF8pWGsHHW8Q1i5uqudCNKsDZG5PR5NYwSRJTSg= +github.com/edgexfoundry/go-mod-messaging/v3 v3.0.0-dev.1/go.mod h1:8weo8jqtlN/lhglBEaFpysftIuFLkCmh6k/dHhPa7IY= +github.com/edgexfoundry/go-mod-registry/v3 v3.0.0-dev.3 h1:QgZF9f70Cwpvkjw3tP1aiVGHc+yNFJNzW6hO8pDs3fg= +github.com/edgexfoundry/go-mod-registry/v3 v3.0.0-dev.3/go.mod h1:2w8v0sv+i21nY+DY6JV4PFxsNTuxpGAjlNFlFMTfZkk= +github.com/edgexfoundry/go-mod-secrets/v3 v3.0.0-dev.1 h1:dib+mZUuHqwVHt9pKAWC4lh60Fbc+6vKrD919LaknwI= +github.com/edgexfoundry/go-mod-secrets/v3 v3.0.0-dev.1/go.mod h1:qIQAc13atZ42+QX0AEJfTvvVC6GfgH/uElrWylyySqk= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -108,9 +108,8 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c h1:964Od4U6p2jUkFxvCydnIczKteheJEzHRToSGK3Bnlw= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= -github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -129,10 +128,10 @@ github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB7 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/hashicorp/consul/api v1.15.3 h1:WYONYL2rxTXtlekAqblR2SCdJsizMDIj/uXb5wNy9zU= -github.com/hashicorp/consul/api v1.15.3/go.mod h1:/g/qgcoBcEXALCNZgRRisyTW0nY86++L0KbeAMXYCeY= -github.com/hashicorp/consul/sdk v0.11.0 h1:HRzj8YSCln2yGgCumN5CL8lYlD3gBurnervJRJAZyC4= -github.com/hashicorp/consul/sdk v0.11.0/go.mod h1:yPkX5Q6CsxTFMjQQDJwzeNmUUF5NUGGbrDsv9wTb8cw= +github.com/hashicorp/consul/api v1.18.0 h1:R7PPNzTCeN6VuQNDwwhZWJvzCtGSrNpJqfb22h3yH9g= +github.com/hashicorp/consul/api v1.18.0/go.mod h1:owRRGJ9M5xReDC5nfT8FTJrNAPbT4NM6p/k+d03q2v4= +github.com/hashicorp/consul/sdk v0.13.0 h1:lce3nFlpv8humJL8rNrrGHYSKc3q+Kxfeg3Ii1m6ZWU= +github.com/hashicorp/consul/sdk v0.13.0/go.mod h1:0hs/l5fOVhJy/VdcoaNqUSi2AUs95eF5WKtv+EYIQqE= github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= @@ -144,9 +143,8 @@ github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.3.0 h1:8exGP7ego3OmkfksihtSouGMZ+hQrhxx+FVELeXpVPE= github.com/hashicorp/go-immutable-radix v1.3.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3 h1:zKjpN5BK/P5lMYrLmBHdBULWbJ0XpYR+7NGzqkZzoD4= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-msgpack v0.5.5 h1:i9R9JSrqIz0QVLz3sz+i3YJdT7TTSLcfLLzJi9aZTuI= -github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= @@ -162,16 +160,17 @@ github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI= +github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= -github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= -github.com/hashicorp/memberlist v0.3.1 h1:MXgUXLqva1QvpVEDQW1IQLG0wivQAtmFlHRQ+1vWZfM= -github.com/hashicorp/memberlist v0.3.1/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= -github.com/hashicorp/serf v0.9.7 h1:hkdgbqizGQHuU5IPqYM1JdSMV8nKfpuOnZYXssk9muY= -github.com/hashicorp/serf v0.9.7/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= +github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR/prTM= +github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0= +github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY= +github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= @@ -229,9 +228,9 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nats-io/jwt/v2 v2.3.0 h1:z2mA1a7tIf5ShggOFlR1oBPgd6hGqcDYsISxZByUzdI= -github.com/nats-io/nats-server/v2 v2.9.3 h1:HrfzA7G9LNetKkm1z+jU/e9kuAe+E6uaBuuq9EB5sQQ= -github.com/nats-io/nats.go v1.18.0 h1:o480Ao6kuSSFyJO75rGTXCEPj7LGkY84C1Ye+Uhm4c0= -github.com/nats-io/nats.go v1.18.0/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w= +github.com/nats-io/nats-server/v2 v2.9.8 h1:jgxZsv+A3Reb3MgwxaINcNq/za8xZInKhDg9Q0cGN1o= +github.com/nats-io/nats.go v1.20.0 h1:T8JJnQfVSdh1CzGiwAOv5hEobYCBho/0EupGznYw0oM= +github.com/nats-io/nats.go v1.20.0/go.mod h1:tLqubohF7t4z3du1QDPYJIQQyhb4wl6DhjxEajSI7UA= github.com/nats-io/nkeys v0.3.0 h1:cgM5tL53EvYRU+2YLXIK0G2mJtK12Ft9oeooSZMA2G8= github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4= github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= @@ -244,8 +243,6 @@ github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pebbe/zmq4 v1.2.7 h1:6EaX83hdFSRUEhgzSW1E/SPoTS3JeYZgYkBvwdcrA9A= -github.com/pebbe/zmq4 v1.2.7/go.mod h1:nqnPueOapVhE2wItZ0uOErngczsJdLOGkebMxaO8r48= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= @@ -378,6 +375,7 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20221010170243-090e33056c14 h1:k5II8e6QD8mITdi+okbbmR/cIyEbeXLBhy5Ha4nevyc= golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/internal/application/callback.go b/internal/application/callback.go index 855031c7f..3602469b9 100644 --- a/internal/application/callback.go +++ b/internal/application/callback.go @@ -10,16 +10,16 @@ import ( "context" "fmt" - "github.com/edgexfoundry/device-sdk-go/v2/internal/cache" - "github.com/edgexfoundry/device-sdk-go/v2/internal/container" - - bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/container" - "github.com/edgexfoundry/go-mod-bootstrap/v2/di" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/device-sdk-go/v3/internal/cache" + "github.com/edgexfoundry/device-sdk-go/v3/internal/container" + + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v3/di" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" ) func UpdateProfile(profileRequest requests.DeviceProfileRequest, lc logger.LoggingClient) errors.EdgeX { diff --git a/internal/application/command.go b/internal/application/command.go index d3e1c85bf..a97dcdc4d 100644 --- a/internal/application/command.go +++ b/internal/application/command.go @@ -17,20 +17,20 @@ import ( "strconv" "strings" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/http/utils" - - "github.com/edgexfoundry/device-sdk-go/v2/internal/cache" - sdkCommon "github.com/edgexfoundry/device-sdk-go/v2/internal/common" - "github.com/edgexfoundry/device-sdk-go/v2/internal/container" - "github.com/edgexfoundry/device-sdk-go/v2/internal/transformer" - sdkModels "github.com/edgexfoundry/device-sdk-go/v2/pkg/models" - - bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/container" - "github.com/edgexfoundry/go-mod-bootstrap/v2/di" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/http/utils" + + "github.com/edgexfoundry/device-sdk-go/v3/internal/cache" + sdkCommon "github.com/edgexfoundry/device-sdk-go/v3/internal/common" + "github.com/edgexfoundry/device-sdk-go/v3/internal/container" + "github.com/edgexfoundry/device-sdk-go/v3/internal/transformer" + sdkModels "github.com/edgexfoundry/device-sdk-go/v3/pkg/models" + + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v3/di" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" ) func GetCommand(ctx context.Context, deviceName string, commandName string, queryParams string, dic *di.Container) (*dtos.Event, errors.EdgeX) { diff --git a/internal/autodiscovery/autodiscovery.go b/internal/autodiscovery/autodiscovery.go index bd9bb7743..f7d42fac8 100644 --- a/internal/autodiscovery/autodiscovery.go +++ b/internal/autodiscovery/autodiscovery.go @@ -12,11 +12,11 @@ import ( "sync" "time" - bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/container" - "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/startup" - "github.com/edgexfoundry/go-mod-bootstrap/v2/di" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/startup" + "github.com/edgexfoundry/go-mod-bootstrap/v3/di" - "github.com/edgexfoundry/device-sdk-go/v2/internal/container" + "github.com/edgexfoundry/device-sdk-go/v3/internal/container" ) func BootstrapHandler( diff --git a/internal/autodiscovery/discovery.go b/internal/autodiscovery/discovery.go index 4a36de3f4..005cc3b62 100644 --- a/internal/autodiscovery/discovery.go +++ b/internal/autodiscovery/discovery.go @@ -9,9 +9,9 @@ package autodiscovery import ( "sync" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" - "github.com/edgexfoundry/device-sdk-go/v2/pkg/models" + "github.com/edgexfoundry/device-sdk-go/v3/pkg/models" ) type discoveryLocker struct { diff --git a/internal/autoevent/executor.go b/internal/autoevent/executor.go index e91675791..d218d0a19 100644 --- a/internal/autoevent/executor.go +++ b/internal/autoevent/executor.go @@ -13,16 +13,16 @@ import ( "time" "github.com/OneOfOne/xxhash" - bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/container" - "github.com/edgexfoundry/go-mod-bootstrap/v2/di" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v3/di" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/google/uuid" - "github.com/edgexfoundry/device-sdk-go/v2/internal/application" - sdkCommon "github.com/edgexfoundry/device-sdk-go/v2/internal/common" + "github.com/edgexfoundry/device-sdk-go/v3/internal/application" + sdkCommon "github.com/edgexfoundry/device-sdk-go/v3/internal/common" ) type Executor struct { diff --git a/internal/autoevent/executor_test.go b/internal/autoevent/executor_test.go index 39ca49881..548b83bb8 100644 --- a/internal/autoevent/executor_test.go +++ b/internal/autoevent/executor_test.go @@ -10,9 +10,9 @@ import ( "math/rand" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/autoevent/manager.go b/internal/autoevent/manager.go index b160048fa..b3b3140e8 100644 --- a/internal/autoevent/manager.go +++ b/internal/autoevent/manager.go @@ -10,13 +10,13 @@ import ( "context" "sync" - bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/container" - "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/startup" - "github.com/edgexfoundry/go-mod-bootstrap/v2/di" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/startup" + "github.com/edgexfoundry/go-mod-bootstrap/v3/di" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" - "github.com/edgexfoundry/device-sdk-go/v2/internal/cache" - "github.com/edgexfoundry/device-sdk-go/v2/internal/container" + "github.com/edgexfoundry/device-sdk-go/v3/internal/cache" + "github.com/edgexfoundry/device-sdk-go/v3/internal/container" ) type manager struct { diff --git a/internal/cache/devices.go b/internal/cache/devices.go index 0168c8b95..4e6e726e4 100644 --- a/internal/cache/devices.go +++ b/internal/cache/devices.go @@ -10,8 +10,8 @@ import ( "fmt" "sync" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" ) var ( diff --git a/internal/cache/devices_test.go b/internal/cache/devices_test.go index e3dd464d8..eb9c22721 100644 --- a/internal/cache/devices_test.go +++ b/internal/cache/devices_test.go @@ -8,7 +8,7 @@ package cache import ( "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/cache/init.go b/internal/cache/init.go index cb98dd68c..f463bd724 100644 --- a/internal/cache/init.go +++ b/internal/cache/init.go @@ -9,12 +9,12 @@ package cache import ( "context" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" - bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/container" - "github.com/edgexfoundry/go-mod-bootstrap/v2/di" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v3/di" ) // InitCache Init basic state for cache diff --git a/internal/cache/profiles.go b/internal/cache/profiles.go index 0aec79881..7c425a133 100644 --- a/internal/cache/profiles.go +++ b/internal/cache/profiles.go @@ -10,8 +10,8 @@ import ( "fmt" "sync" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" ) var ( diff --git a/internal/cache/profiles_test.go b/internal/cache/profiles_test.go index e8a62efc2..3421f312c 100644 --- a/internal/cache/profiles_test.go +++ b/internal/cache/profiles_test.go @@ -8,8 +8,8 @@ package cache import ( "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/stretchr/testify/assert" ) diff --git a/internal/cache/provisionwatcher.go b/internal/cache/provisionwatcher.go index 90ece099e..865e7f0d0 100644 --- a/internal/cache/provisionwatcher.go +++ b/internal/cache/provisionwatcher.go @@ -9,8 +9,8 @@ import ( "fmt" "sync" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" ) var ( diff --git a/internal/cache/provisionwatcher_test.go b/internal/cache/provisionwatcher_test.go index 725f7167f..cb2f27f25 100644 --- a/internal/cache/provisionwatcher_test.go +++ b/internal/cache/provisionwatcher_test.go @@ -8,7 +8,7 @@ package cache import ( "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/clients/clients.go b/internal/clients/clients.go index f66ec2444..8373f799f 100644 --- a/internal/clients/clients.go +++ b/internal/clients/clients.go @@ -7,7 +7,7 @@ package clients import ( - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/interfaces" ) type EdgeXClients struct { diff --git a/internal/common/utils.go b/internal/common/utils.go index e12f1f186..832bd589b 100644 --- a/internal/common/utils.go +++ b/internal/common/utils.go @@ -12,18 +12,18 @@ import ( "fmt" "time" - "github.com/edgexfoundry/device-sdk-go/v2/internal/container" - bootstrapInterfaces "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/interfaces" + "github.com/edgexfoundry/device-sdk-go/v3/internal/container" + bootstrapInterfaces "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/interfaces" gometrics "github.com/rcrowley/go-metrics" - bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/container" - "github.com/edgexfoundry/go-mod-bootstrap/v2/di" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-messaging/v2/pkg/types" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v3/di" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" ) const ( diff --git a/internal/common/utils_test.go b/internal/common/utils_test.go index 3165b88ed..0b1ef0444 100644 --- a/internal/common/utils_test.go +++ b/internal/common/utils_test.go @@ -9,23 +9,23 @@ import ( "errors" "testing" - bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/container" - "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/interfaces/mocks" - "github.com/edgexfoundry/go-mod-bootstrap/v2/di" - clientMocks "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/interfaces/mocks" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger" - mocks2 "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger/mocks" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - msgMocks "github.com/edgexfoundry/go-mod-messaging/v2/messaging/mocks" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/interfaces/mocks" + "github.com/edgexfoundry/go-mod-bootstrap/v3/di" + clientMocks "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/interfaces/mocks" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + mocks2 "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger/mocks" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + msgMocks "github.com/edgexfoundry/go-mod-messaging/v3/messaging/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/edgexfoundry/device-sdk-go/v2/internal/config" - "github.com/edgexfoundry/device-sdk-go/v2/internal/container" + "github.com/edgexfoundry/device-sdk-go/v3/internal/config" + "github.com/edgexfoundry/device-sdk-go/v3/internal/container" ) const ( diff --git a/internal/config/config.go b/internal/config/config.go index d7493c460..64998ec96 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -7,7 +7,7 @@ package config import ( - bootstrapConfig "github.com/edgexfoundry/go-mod-bootstrap/v2/config" + bootstrapConfig "github.com/edgexfoundry/go-mod-bootstrap/v3/config" ) // ConfigurationStruct contains the configuration properties for the device service. diff --git a/internal/config/types.go b/internal/config/types.go index 55f0e51dd..26a3e360f 100644 --- a/internal/config/types.go +++ b/internal/config/types.go @@ -9,7 +9,7 @@ package config import ( - "github.com/edgexfoundry/go-mod-bootstrap/v2/config" + "github.com/edgexfoundry/go-mod-bootstrap/v3/config" ) // WritableInfo is a struct which contains configuration settings that can be changed in the Registry . diff --git a/internal/container/config.go b/internal/container/config.go index 6094d9680..30f5d74fd 100644 --- a/internal/container/config.go +++ b/internal/container/config.go @@ -7,9 +7,9 @@ package container import ( - "github.com/edgexfoundry/go-mod-bootstrap/v2/di" + "github.com/edgexfoundry/go-mod-bootstrap/v3/di" - "github.com/edgexfoundry/device-sdk-go/v2/internal/config" + "github.com/edgexfoundry/device-sdk-go/v3/internal/config" ) // ConfigurationName contains the name of device service's ConfigurationStruct implementation in the DIC. diff --git a/internal/container/deviceservice.go b/internal/container/deviceservice.go index f5dcd98c8..ac81e086e 100644 --- a/internal/container/deviceservice.go +++ b/internal/container/deviceservice.go @@ -7,10 +7,10 @@ package container import ( - "github.com/edgexfoundry/go-mod-bootstrap/v2/di" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-bootstrap/v3/di" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" - sdkModels "github.com/edgexfoundry/device-sdk-go/v2/pkg/models" + sdkModels "github.com/edgexfoundry/device-sdk-go/v3/pkg/models" ) // DeviceServiceName contains the name of device service struct in the DIC. diff --git a/internal/controller/http/callback.go b/internal/controller/http/callback.go index af18f453f..e7bc0d4ee 100644 --- a/internal/controller/http/callback.go +++ b/internal/controller/http/callback.go @@ -10,13 +10,13 @@ import ( "encoding/json" "net/http" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - commonDTO "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + commonDTO "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" "github.com/gorilla/mux" - "github.com/edgexfoundry/device-sdk-go/v2/internal/application" + "github.com/edgexfoundry/device-sdk-go/v3/internal/application" ) func (c *RestController) DeleteDevice(writer http.ResponseWriter, request *http.Request) { diff --git a/internal/controller/http/command.go b/internal/controller/http/command.go index e0cc0e4d0..f7ca6f3f7 100644 --- a/internal/controller/http/command.go +++ b/internal/controller/http/command.go @@ -13,15 +13,15 @@ import ( "net/url" "strings" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/http/utils" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - commonDTO "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/http/utils" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + commonDTO "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" "github.com/gorilla/mux" - "github.com/edgexfoundry/device-sdk-go/v2/internal/application" - sdkCommon "github.com/edgexfoundry/device-sdk-go/v2/internal/common" + "github.com/edgexfoundry/device-sdk-go/v3/internal/application" + sdkCommon "github.com/edgexfoundry/device-sdk-go/v3/internal/common" ) func (c *RestController) GetCommand(w http.ResponseWriter, r *http.Request) { diff --git a/internal/controller/http/command_test.go b/internal/controller/http/command_test.go index e684e0d98..cf111ead4 100644 --- a/internal/controller/http/command_test.go +++ b/internal/controller/http/command_test.go @@ -14,25 +14,25 @@ import ( "strings" "testing" - bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/container" - "github.com/edgexfoundry/go-mod-bootstrap/v2/di" - clientMocks "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/interfaces/mocks" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - commonDTO "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v3/di" + clientMocks "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/interfaces/mocks" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + commonDTO "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/gorilla/mux" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/edgexfoundry/device-sdk-go/v2/internal/cache" - "github.com/edgexfoundry/device-sdk-go/v2/internal/config" - "github.com/edgexfoundry/device-sdk-go/v2/internal/container" - sdkModels "github.com/edgexfoundry/device-sdk-go/v2/pkg/models" - "github.com/edgexfoundry/device-sdk-go/v2/pkg/models/mocks" + "github.com/edgexfoundry/device-sdk-go/v3/internal/cache" + "github.com/edgexfoundry/device-sdk-go/v3/internal/config" + "github.com/edgexfoundry/device-sdk-go/v3/internal/container" + sdkModels "github.com/edgexfoundry/device-sdk-go/v3/pkg/models" + "github.com/edgexfoundry/device-sdk-go/v3/pkg/models/mocks" ) const ( diff --git a/internal/controller/http/common.go b/internal/controller/http/common.go index 8c4051320..e8f098a89 100644 --- a/internal/controller/http/common.go +++ b/internal/controller/http/common.go @@ -11,16 +11,16 @@ import ( "net/http" "strings" - bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/container" - "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - commonDTO "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - - sdkCommon "github.com/edgexfoundry/device-sdk-go/v2/internal/common" - "github.com/edgexfoundry/device-sdk-go/v2/internal/config" - "github.com/edgexfoundry/device-sdk-go/v2/internal/container" - "github.com/edgexfoundry/device-sdk-go/v2/internal/telemetry" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + commonDTO "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + + sdkCommon "github.com/edgexfoundry/device-sdk-go/v3/internal/common" + "github.com/edgexfoundry/device-sdk-go/v3/internal/config" + "github.com/edgexfoundry/device-sdk-go/v3/internal/container" + "github.com/edgexfoundry/device-sdk-go/v3/internal/telemetry" ) // Ping handles the request to /ping endpoint. Is used to test if the service is working diff --git a/internal/controller/http/common_test.go b/internal/controller/http/common_test.go index 32d1d9fce..e7bbdfb05 100644 --- a/internal/controller/http/common_test.go +++ b/internal/controller/http/common_test.go @@ -28,22 +28,22 @@ import ( "testing" "time" - bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/container" - "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/interfaces/mocks" - "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/secret" - bootstrapConfig "github.com/edgexfoundry/go-mod-bootstrap/v2/config" - "github.com/edgexfoundry/go-mod-bootstrap/v2/di" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - commonDTO "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/interfaces/mocks" + "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/secret" + bootstrapConfig "github.com/edgexfoundry/go-mod-bootstrap/v3/config" + "github.com/edgexfoundry/go-mod-bootstrap/v3/di" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + commonDTO "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" "github.com/google/uuid" "github.com/gorilla/mux" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - sdkCommon "github.com/edgexfoundry/device-sdk-go/v2/internal/common" - "github.com/edgexfoundry/device-sdk-go/v2/internal/config" - "github.com/edgexfoundry/device-sdk-go/v2/internal/container" + sdkCommon "github.com/edgexfoundry/device-sdk-go/v3/internal/common" + "github.com/edgexfoundry/device-sdk-go/v3/internal/config" + "github.com/edgexfoundry/device-sdk-go/v3/internal/container" ) var expectedCorrelationId = uuid.New().String() diff --git a/internal/controller/http/correlation/handler.go b/internal/controller/http/correlation/handler.go index 93686a53f..ef5b24038 100644 --- a/internal/controller/http/correlation/handler.go +++ b/internal/controller/http/correlation/handler.go @@ -9,7 +9,7 @@ package correlation import ( "context" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" ) func IdFromContext(ctx context.Context) string { diff --git a/internal/controller/http/correlation/middleware.go b/internal/controller/http/correlation/middleware.go index 79dcb11b5..74dd876f2 100644 --- a/internal/controller/http/correlation/middleware.go +++ b/internal/controller/http/correlation/middleware.go @@ -11,9 +11,9 @@ import ( "net/http" "time" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/google/uuid" ) diff --git a/internal/controller/http/discovery.go b/internal/controller/http/discovery.go index f45245428..1437a7e27 100644 --- a/internal/controller/http/discovery.go +++ b/internal/controller/http/discovery.go @@ -9,12 +9,12 @@ package http import ( "net/http" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" - "github.com/edgexfoundry/device-sdk-go/v2/internal/autodiscovery" - "github.com/edgexfoundry/device-sdk-go/v2/internal/container" + "github.com/edgexfoundry/device-sdk-go/v3/internal/autodiscovery" + "github.com/edgexfoundry/device-sdk-go/v3/internal/container" ) func (c *RestController) Discovery(writer http.ResponseWriter, request *http.Request) { diff --git a/internal/controller/http/restrouter.go b/internal/controller/http/restrouter.go index 62bab9eea..3f91ffaea 100644 --- a/internal/controller/http/restrouter.go +++ b/internal/controller/http/restrouter.go @@ -13,17 +13,17 @@ import ( "fmt" "net/http" - bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/container" - "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/interfaces" - "github.com/edgexfoundry/go-mod-bootstrap/v2/di" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - commonDTO "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/interfaces" + "github.com/edgexfoundry/go-mod-bootstrap/v3/di" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + commonDTO "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" "github.com/gorilla/mux" - "github.com/edgexfoundry/device-sdk-go/v2/internal/controller/http/correlation" + "github.com/edgexfoundry/device-sdk-go/v3/internal/controller/http/correlation" ) type RestController struct { diff --git a/internal/controller/http/restrouter_test.go b/internal/controller/http/restrouter_test.go index 1ce4f9e1a..d9c594fbb 100644 --- a/internal/controller/http/restrouter_test.go +++ b/internal/controller/http/restrouter_test.go @@ -23,15 +23,15 @@ import ( "net/http" "testing" - bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/container" - "github.com/edgexfoundry/go-mod-bootstrap/v2/di" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v3/di" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" "github.com/gorilla/mux" "github.com/stretchr/testify/assert" - "github.com/edgexfoundry/device-sdk-go/v2/internal/config" - "github.com/edgexfoundry/device-sdk-go/v2/internal/container" + "github.com/edgexfoundry/device-sdk-go/v3/internal/config" + "github.com/edgexfoundry/device-sdk-go/v3/internal/container" ) func TestAddRoute(t *testing.T) { diff --git a/internal/controller/http/validation.go b/internal/controller/http/validation.go index 307fbc45c..6886ca71f 100644 --- a/internal/controller/http/validation.go +++ b/internal/controller/http/validation.go @@ -9,13 +9,13 @@ import ( "encoding/json" "net/http" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - commonDTO "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + commonDTO "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" - "github.com/edgexfoundry/device-sdk-go/v2/internal/container" + "github.com/edgexfoundry/device-sdk-go/v3/internal/container" ) func (c *RestController) ValidateDevice(writer http.ResponseWriter, request *http.Request) { diff --git a/internal/controller/http/validation_test.go b/internal/controller/http/validation_test.go index e5bf767af..156e0c5cb 100644 --- a/internal/controller/http/validation_test.go +++ b/internal/controller/http/validation_test.go @@ -13,21 +13,21 @@ import ( "strings" "testing" - bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/container" - "github.com/edgexfoundry/go-mod-bootstrap/v2/di" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - commonDTO "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v3/di" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + commonDTO "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/google/uuid" "github.com/gorilla/mux" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/edgexfoundry/device-sdk-go/v2/internal/container" - "github.com/edgexfoundry/device-sdk-go/v2/pkg/models/mocks" + "github.com/edgexfoundry/device-sdk-go/v3/internal/container" + "github.com/edgexfoundry/device-sdk-go/v3/pkg/models/mocks" ) var mockDevice = requests.AddDeviceRequest{ diff --git a/internal/controller/messaging/command.go b/internal/controller/messaging/command.go index fb67c1622..7a909379d 100644 --- a/internal/controller/messaging/command.go +++ b/internal/controller/messaging/command.go @@ -12,16 +12,16 @@ import ( "net/http" "strings" - bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/container" - "github.com/edgexfoundry/go-mod-bootstrap/v2/di" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-messaging/v2/pkg/types" - - "github.com/edgexfoundry/device-sdk-go/v2/internal/application" - sdkCommon "github.com/edgexfoundry/device-sdk-go/v2/internal/common" - "github.com/edgexfoundry/device-sdk-go/v2/internal/container" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v3/di" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + + "github.com/edgexfoundry/device-sdk-go/v3/internal/application" + sdkCommon "github.com/edgexfoundry/device-sdk-go/v3/internal/common" + "github.com/edgexfoundry/device-sdk-go/v3/internal/container" ) const ( diff --git a/internal/provision/devices.go b/internal/provision/devices.go index 18f15b284..f3e077ea4 100644 --- a/internal/provision/devices.go +++ b/internal/provision/devices.go @@ -14,16 +14,16 @@ import ( "path/filepath" "strings" - "github.com/edgexfoundry/device-sdk-go/v2/internal/cache" - "github.com/edgexfoundry/device-sdk-go/v2/internal/container" + "github.com/edgexfoundry/device-sdk-go/v3/internal/cache" + "github.com/edgexfoundry/device-sdk-go/v3/internal/container" - bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/container" - "github.com/edgexfoundry/go-mod-bootstrap/v2/di" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v3/di" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/google/uuid" "github.com/pelletier/go-toml" ) diff --git a/internal/provision/profiles.go b/internal/provision/profiles.go index 8e52ce24e..9984d6edb 100644 --- a/internal/provision/profiles.go +++ b/internal/provision/profiles.go @@ -15,14 +15,14 @@ import ( "path/filepath" "strings" - "github.com/edgexfoundry/device-sdk-go/v2/internal/cache" + "github.com/edgexfoundry/device-sdk-go/v3/internal/cache" - bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/container" - "github.com/edgexfoundry/go-mod-bootstrap/v2/di" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v3/di" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" "github.com/google/uuid" "gopkg.in/yaml.v3" ) diff --git a/internal/telemetry/telemetry.go b/internal/telemetry/telemetry.go index fdf4c6066..bb7567598 100644 --- a/internal/telemetry/telemetry.go +++ b/internal/telemetry/telemetry.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" ) // SystemUsage diff --git a/internal/telemetry/unimplemented_cpu.go b/internal/telemetry/unimplemented_cpu.go index ce3aa71d9..c18c1b1ee 100644 --- a/internal/telemetry/unimplemented_cpu.go +++ b/internal/telemetry/unimplemented_cpu.go @@ -18,7 +18,7 @@ package telemetry import ( - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" ) var LoggingClient logger.LoggingClient diff --git a/internal/transformer/checkNaN.go b/internal/transformer/checkNaN.go index 11e8c90c3..a038e00a8 100644 --- a/internal/transformer/checkNaN.go +++ b/internal/transformer/checkNaN.go @@ -9,10 +9,10 @@ package transformer import ( "math" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" - "github.com/edgexfoundry/device-sdk-go/v2/pkg/models" + "github.com/edgexfoundry/device-sdk-go/v3/pkg/models" ) func isNaN(cv *models.CommandValue) (bool, errors.EdgeX) { diff --git a/internal/transformer/checkNaN_test.go b/internal/transformer/checkNaN_test.go index 4824183d6..643dc6478 100644 --- a/internal/transformer/checkNaN_test.go +++ b/internal/transformer/checkNaN_test.go @@ -10,11 +10,11 @@ import ( "math" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/edgexfoundry/device-sdk-go/v2/pkg/models" + "github.com/edgexfoundry/device-sdk-go/v3/pkg/models" ) func Test_isNaN(t *testing.T) { diff --git a/internal/transformer/transform.go b/internal/transformer/transform.go index fbb7c903f..07ee70238 100644 --- a/internal/transformer/transform.go +++ b/internal/transformer/transform.go @@ -10,15 +10,15 @@ import ( "sync" "time" - "github.com/edgexfoundry/device-sdk-go/v2/internal/cache" - "github.com/edgexfoundry/device-sdk-go/v2/internal/container" - "github.com/edgexfoundry/device-sdk-go/v2/pkg/models" - - bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/container" - "github.com/edgexfoundry/go-mod-bootstrap/v2/di" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/device-sdk-go/v3/internal/cache" + "github.com/edgexfoundry/device-sdk-go/v3/internal/container" + "github.com/edgexfoundry/device-sdk-go/v3/pkg/models" + + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v3/di" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) var ( diff --git a/internal/transformer/transform_test.go b/internal/transformer/transform_test.go index dae0fd48d..21b3b9b62 100644 --- a/internal/transformer/transform_test.go +++ b/internal/transformer/transform_test.go @@ -11,21 +11,21 @@ import ( "math/rand" "testing" - "github.com/edgexfoundry/device-sdk-go/v2/internal/cache" - "github.com/edgexfoundry/device-sdk-go/v2/internal/config" - "github.com/edgexfoundry/device-sdk-go/v2/internal/container" - sdkModels "github.com/edgexfoundry/device-sdk-go/v2/pkg/models" - "github.com/edgexfoundry/device-sdk-go/v2/pkg/models/mocks" - bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/container" - "github.com/edgexfoundry/go-mod-bootstrap/v2/di" - clientMocks "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/interfaces/mocks" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" - - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger" + "github.com/edgexfoundry/device-sdk-go/v3/internal/cache" + "github.com/edgexfoundry/device-sdk-go/v3/internal/config" + "github.com/edgexfoundry/device-sdk-go/v3/internal/container" + sdkModels "github.com/edgexfoundry/device-sdk-go/v3/pkg/models" + "github.com/edgexfoundry/device-sdk-go/v3/pkg/models/mocks" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v3/di" + clientMocks "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/interfaces/mocks" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" + + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/transformer/transformparam.go b/internal/transformer/transformparam.go index ab3b4bfc6..2f533720c 100644 --- a/internal/transformer/transformparam.go +++ b/internal/transformer/transformparam.go @@ -10,10 +10,10 @@ import ( "fmt" "strconv" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" - dsModels "github.com/edgexfoundry/device-sdk-go/v2/pkg/models" + dsModels "github.com/edgexfoundry/device-sdk-go/v3/pkg/models" ) func TransformWriteParameter(cv *dsModels.CommandValue, pv models.ResourceProperties) errors.EdgeX { diff --git a/internal/transformer/transformresult.go b/internal/transformer/transformresult.go index f56795d3c..ec4ba749d 100644 --- a/internal/transformer/transformresult.go +++ b/internal/transformer/transformresult.go @@ -11,14 +11,14 @@ import ( "math" "strconv" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" - sdkCommon "github.com/edgexfoundry/device-sdk-go/v2/internal/common" - sdkModels "github.com/edgexfoundry/device-sdk-go/v2/pkg/models" + sdkCommon "github.com/edgexfoundry/device-sdk-go/v3/internal/common" + sdkModels "github.com/edgexfoundry/device-sdk-go/v3/pkg/models" ) const ( diff --git a/internal/transformer/transformresult_test.go b/internal/transformer/transformresult_test.go index 47292eaa7..46aa7eb00 100644 --- a/internal/transformer/transformresult_test.go +++ b/internal/transformer/transformresult_test.go @@ -11,12 +11,12 @@ import ( "math" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/edgexfoundry/device-sdk-go/v2/pkg/models" + "github.com/edgexfoundry/device-sdk-go/v3/pkg/models" ) func Test_transformReadBase(t *testing.T) { diff --git a/pkg/interfaces/mocks/DeviceServiceSDK.go b/pkg/interfaces/mocks/DeviceServiceSDK.go index b16157efa..ee0a31c24 100644 --- a/pkg/interfaces/mocks/DeviceServiceSDK.go +++ b/pkg/interfaces/mocks/DeviceServiceSDK.go @@ -1,19 +1,19 @@ -// Code generated by mockery v2.14.0. DO NOT EDIT. +// Code generated by mockery v2.15.0. DO NOT EDIT. package mocks import ( http "net/http" - bootstrapinterfaces "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/interfaces" + bootstrapinterfaces "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/interfaces" - logger "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger" + logger "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" mock "github.com/stretchr/testify/mock" - models "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + models "github.com/edgexfoundry/go-mod-core-contracts/v3/models" - service "github.com/edgexfoundry/device-sdk-go/v2/pkg/service" + service "github.com/edgexfoundry/device-sdk-go/v3/pkg/service" ) // DeviceServiceSDK is an autogenerated mock type for the DeviceServiceSDK type diff --git a/pkg/interfaces/service.go b/pkg/interfaces/service.go index d570d01fe..effc474e4 100644 --- a/pkg/interfaces/service.go +++ b/pkg/interfaces/service.go @@ -8,11 +8,11 @@ package interfaces import ( "net/http" - "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" - "github.com/edgexfoundry/device-sdk-go/v2/pkg/service" + "github.com/edgexfoundry/device-sdk-go/v3/pkg/service" ) // DeviceServiceSDK defines the interface for an Edgex Device Service SDK diff --git a/pkg/models/commandvalue.go b/pkg/models/commandvalue.go index 5a6de960d..f582b23f6 100644 --- a/pkg/models/commandvalue.go +++ b/pkg/models/commandvalue.go @@ -11,8 +11,8 @@ import ( "encoding/binary" "fmt" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) const ( diff --git a/pkg/models/commandvalue_test.go b/pkg/models/commandvalue_test.go index 498084c7c..4c1fdc380 100644 --- a/pkg/models/commandvalue_test.go +++ b/pkg/models/commandvalue_test.go @@ -13,7 +13,7 @@ import ( "testing" "time" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/models/devicevalidator.go b/pkg/models/devicevalidator.go index 94086a116..e26c8d8a7 100644 --- a/pkg/models/devicevalidator.go +++ b/pkg/models/devicevalidator.go @@ -5,7 +5,7 @@ package models -import "github.com/edgexfoundry/go-mod-core-contracts/v2/models" +import "github.com/edgexfoundry/go-mod-core-contracts/v3/models" // DeviceValidator is a low-level device-specific interface implemented // by device services that validate device's protocol properties. diff --git a/pkg/models/mocks/DeviceValidator.go b/pkg/models/mocks/DeviceValidator.go index 19c59ed97..f6eaaae95 100644 --- a/pkg/models/mocks/DeviceValidator.go +++ b/pkg/models/mocks/DeviceValidator.go @@ -1,9 +1,9 @@ -// Code generated by mockery v0.0.0-dev. DO NOT EDIT. +// Code generated by mockery v2.15.0. DO NOT EDIT. package mocks import ( - models "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + models "github.com/edgexfoundry/go-mod-core-contracts/v3/models" mock "github.com/stretchr/testify/mock" ) @@ -25,3 +25,18 @@ func (_m *DeviceValidator) ValidateDevice(device models.Device) error { return r0 } + +type mockConstructorTestingTNewDeviceValidator interface { + mock.TestingT + Cleanup(func()) +} + +// NewDeviceValidator creates a new instance of DeviceValidator. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewDeviceValidator(t mockConstructorTestingTNewDeviceValidator) *DeviceValidator { + mock := &DeviceValidator{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/pkg/models/mocks/ProtocolDriver.go b/pkg/models/mocks/ProtocolDriver.go index da98a9e7f..04745f00c 100644 --- a/pkg/models/mocks/ProtocolDriver.go +++ b/pkg/models/mocks/ProtocolDriver.go @@ -1,14 +1,14 @@ -// Code generated by mockery v0.0.0-dev. DO NOT EDIT. +// Code generated by mockery v2.15.0. DO NOT EDIT. package mocks import ( - logger "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger" + logger "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" mock "github.com/stretchr/testify/mock" - models "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + models "github.com/edgexfoundry/go-mod-core-contracts/v3/models" - pkgmodels "github.com/edgexfoundry/device-sdk-go/v2/pkg/models" + pkgmodels "github.com/edgexfoundry/device-sdk-go/v3/pkg/models" ) // ProtocolDriver is an autogenerated mock type for the ProtocolDriver type @@ -122,3 +122,18 @@ func (_m *ProtocolDriver) UpdateDevice(deviceName string, protocols map[string]m return r0 } + +type mockConstructorTestingTNewProtocolDriver interface { + mock.TestingT + Cleanup(func()) +} + +// NewProtocolDriver creates a new instance of ProtocolDriver. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewProtocolDriver(t mockConstructorTestingTNewProtocolDriver) *ProtocolDriver { + mock := &ProtocolDriver{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/pkg/models/protocoldiscovery.go b/pkg/models/protocoldiscovery.go index 3b49770cd..6c2105ff0 100644 --- a/pkg/models/protocoldiscovery.go +++ b/pkg/models/protocoldiscovery.go @@ -8,7 +8,7 @@ package models import ( - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" ) // ProtocolDiscovery is a low-level device-specific interface implemented diff --git a/pkg/models/protocoldriver.go b/pkg/models/protocoldriver.go index 6652b2b2a..a29aaeba0 100644 --- a/pkg/models/protocoldriver.go +++ b/pkg/models/protocoldriver.go @@ -9,12 +9,11 @@ // Service. The interfaces provide an asbstraction layer for the device // or protocol specific logic of a Device Service, and the structs represents request // and response data format used by the protocol driver. -// package models import ( - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" ) // ProtocolDriver is a low-level device-specific interface used by diff --git a/pkg/service/async.go b/pkg/service/async.go index 5913d7195..a4b2872e9 100644 --- a/pkg/service/async.go +++ b/pkg/service/async.go @@ -12,16 +12,16 @@ import ( "regexp" "sync" - "github.com/edgexfoundry/go-mod-bootstrap/v2/di" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-bootstrap/v3/di" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" - "github.com/edgexfoundry/device-sdk-go/v2/internal/cache" - "github.com/edgexfoundry/device-sdk-go/v2/internal/common" - "github.com/edgexfoundry/device-sdk-go/v2/internal/transformer" - sdkModels "github.com/edgexfoundry/device-sdk-go/v2/pkg/models" + "github.com/edgexfoundry/device-sdk-go/v3/internal/cache" + "github.com/edgexfoundry/device-sdk-go/v3/internal/common" + "github.com/edgexfoundry/device-sdk-go/v3/internal/transformer" + sdkModels "github.com/edgexfoundry/device-sdk-go/v3/pkg/models" ) // processAsyncResults processes readings that are pushed from diff --git a/pkg/service/async_test.go b/pkg/service/async_test.go index 2a3dff5d4..8744ac677 100644 --- a/pkg/service/async_test.go +++ b/pkg/service/async_test.go @@ -8,11 +8,11 @@ package service import ( "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/stretchr/testify/assert" - sdkModels "github.com/edgexfoundry/device-sdk-go/v2/pkg/models" + sdkModels "github.com/edgexfoundry/device-sdk-go/v3/pkg/models" ) var d = sdkModels.DiscoveredDevice{ diff --git a/pkg/service/init.go b/pkg/service/init.go index e41e4c85d..36d421003 100644 --- a/pkg/service/init.go +++ b/pkg/service/init.go @@ -10,14 +10,14 @@ import ( "context" "sync" - "github.com/edgexfoundry/device-sdk-go/v2/internal/common" - "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/startup" - "github.com/edgexfoundry/go-mod-bootstrap/v2/di" + "github.com/edgexfoundry/device-sdk-go/v3/internal/common" + "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/startup" + "github.com/edgexfoundry/go-mod-bootstrap/v3/di" "github.com/gorilla/mux" - "github.com/edgexfoundry/device-sdk-go/v2/internal/cache" - "github.com/edgexfoundry/device-sdk-go/v2/internal/provision" - "github.com/edgexfoundry/device-sdk-go/v2/pkg/models" + "github.com/edgexfoundry/device-sdk-go/v3/internal/cache" + "github.com/edgexfoundry/device-sdk-go/v3/internal/provision" + "github.com/edgexfoundry/device-sdk-go/v3/pkg/models" ) // Bootstrap contains references to dependencies required by the BootstrapHandler. diff --git a/pkg/service/main.go b/pkg/service/main.go index c2cf2e7ec..8972faf51 100644 --- a/pkg/service/main.go +++ b/pkg/service/main.go @@ -11,21 +11,21 @@ import ( "os" "sync" - "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap" - bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/container" - "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/flags" - "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/handlers" - "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/interfaces" - "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/startup" - "github.com/edgexfoundry/go-mod-bootstrap/v2/di" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" + "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/flags" + "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/handlers" + "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/interfaces" + "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/startup" + "github.com/edgexfoundry/go-mod-bootstrap/v3/di" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" "github.com/gorilla/mux" - "github.com/edgexfoundry/device-sdk-go/v2/internal/autodiscovery" - "github.com/edgexfoundry/device-sdk-go/v2/internal/autoevent" - "github.com/edgexfoundry/device-sdk-go/v2/internal/container" - "github.com/edgexfoundry/device-sdk-go/v2/internal/controller/messaging" + "github.com/edgexfoundry/device-sdk-go/v3/internal/autodiscovery" + "github.com/edgexfoundry/device-sdk-go/v3/internal/autoevent" + "github.com/edgexfoundry/device-sdk-go/v3/internal/container" + "github.com/edgexfoundry/device-sdk-go/v3/internal/controller/messaging" ) const EnvInstanceName = "EDGEX_INSTANCE_NAME" diff --git a/pkg/service/managedautoevents.go b/pkg/service/managedautoevents.go index fd80bcf91..22eafde8c 100644 --- a/pkg/service/managedautoevents.go +++ b/pkg/service/managedautoevents.go @@ -10,10 +10,10 @@ package service import ( "fmt" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" - "github.com/edgexfoundry/device-sdk-go/v2/internal/cache" + "github.com/edgexfoundry/device-sdk-go/v3/internal/cache" ) // AddDeviceAutoEvent adds a new AutoEvent to the Device with given name diff --git a/pkg/service/manageddevices.go b/pkg/service/manageddevices.go index a3a8b7a6b..9ad85a043 100644 --- a/pkg/service/manageddevices.go +++ b/pkg/service/manageddevices.go @@ -11,15 +11,15 @@ import ( "context" "fmt" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - commonDTO "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + commonDTO "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/google/uuid" - "github.com/edgexfoundry/device-sdk-go/v2/internal/cache" + "github.com/edgexfoundry/device-sdk-go/v3/internal/cache" ) // AddDevice adds a new Device to the Device Service and Core Metadata diff --git a/pkg/service/managedprofiles.go b/pkg/service/managedprofiles.go index a95788f89..03b7536cb 100644 --- a/pkg/service/managedprofiles.go +++ b/pkg/service/managedprofiles.go @@ -11,14 +11,14 @@ import ( "context" "fmt" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/google/uuid" - "github.com/edgexfoundry/device-sdk-go/v2/internal/cache" + "github.com/edgexfoundry/device-sdk-go/v3/internal/cache" ) // AddDeviceProfile adds a new DeviceProfile to the Device Service and Core Metadata diff --git a/pkg/service/managedwatchers.go b/pkg/service/managedwatchers.go index da53d7577..bb0329e33 100644 --- a/pkg/service/managedwatchers.go +++ b/pkg/service/managedwatchers.go @@ -10,14 +10,14 @@ import ( "context" "fmt" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/google/uuid" - "github.com/edgexfoundry/device-sdk-go/v2/internal/cache" + "github.com/edgexfoundry/device-sdk-go/v3/internal/cache" ) // AddProvisionWatcher adds a new Watcher to the cache and Core Metadata diff --git a/pkg/service/service.go b/pkg/service/service.go index 0d784ad38..a72c3a1cc 100644 --- a/pkg/service/service.go +++ b/pkg/service/service.go @@ -19,26 +19,26 @@ import ( "strconv" "sync" - "github.com/edgexfoundry/device-sdk-go/v2/internal/clients" - sdkCommon "github.com/edgexfoundry/device-sdk-go/v2/internal/common" - "github.com/edgexfoundry/device-sdk-go/v2/internal/config" - "github.com/edgexfoundry/device-sdk-go/v2/internal/container" - restController "github.com/edgexfoundry/device-sdk-go/v2/internal/controller/http" - sdkModels "github.com/edgexfoundry/device-sdk-go/v2/pkg/models" - - bootstrapConfig "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/config" - bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/container" - "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/flags" - "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/interfaces" - bootstrapTypes "github.com/edgexfoundry/go-mod-bootstrap/v2/config" - "github.com/edgexfoundry/go-mod-bootstrap/v2/di" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" - "github.com/edgexfoundry/go-mod-registry/v2/registry" + "github.com/edgexfoundry/device-sdk-go/v3/internal/clients" + sdkCommon "github.com/edgexfoundry/device-sdk-go/v3/internal/common" + "github.com/edgexfoundry/device-sdk-go/v3/internal/config" + "github.com/edgexfoundry/device-sdk-go/v3/internal/container" + restController "github.com/edgexfoundry/device-sdk-go/v3/internal/controller/http" + sdkModels "github.com/edgexfoundry/device-sdk-go/v3/pkg/models" + + bootstrapConfig "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/config" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/flags" + "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/interfaces" + bootstrapTypes "github.com/edgexfoundry/go-mod-bootstrap/v3/config" + "github.com/edgexfoundry/go-mod-bootstrap/v3/di" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" + "github.com/edgexfoundry/go-mod-registry/v3/registry" "github.com/google/uuid" "github.com/gorilla/mux" ) diff --git a/pkg/startup/bootstrap.go b/pkg/startup/bootstrap.go index 601ffd06e..397d0df01 100644 --- a/pkg/startup/bootstrap.go +++ b/pkg/startup/bootstrap.go @@ -10,7 +10,7 @@ package startup import ( "context" - "github.com/edgexfoundry/device-sdk-go/v2/pkg/service" + "github.com/edgexfoundry/device-sdk-go/v3/pkg/service" "github.com/gorilla/mux" )