From 29cfcd21b073993d777ed4b409c3fe4b3a9d4427 Mon Sep 17 00:00:00 2001 From: Ginny Guan Date: Wed, 30 Oct 2024 17:07:52 +0800 Subject: [PATCH] refactor!: update module to v4 BREAKING CHANGE: import paths will need to change to v4, also replace consul with keeper Signed-off-by: Ginny Guan --- app-service-template/Attribution.txt | 427 +++++++----------- app-service-template/Dockerfile | 2 +- app-service-template/Makefile | 2 +- app-service-template/config/configuration.go | 4 +- app-service-template/functions/sample.go | 6 +- app-service-template/functions/sample_test.go | 18 +- app-service-template/go.mod | 28 +- app-service-template/go.sum | 149 +----- app-service-template/main.go | 12 +- app-service-template/main_test.go | 6 +- go.mod | 26 +- go.sum | 149 +----- internal/app/backgroundmessage.go | 2 +- internal/app/backgroundpublisher.go | 4 +- internal/app/backgroundpublisher_test.go | 2 +- internal/app/configupdates.go | 8 +- internal/app/configurable.go | 14 +- internal/app/configurable_test.go | 2 +- internal/app/service.go | 54 +-- internal/app/service_test.go | 40 +- internal/app/storeforward.go | 23 +- internal/app/storeforward_test.go | 9 +- internal/app/triggerfactory.go | 10 +- internal/app/triggerfactory_test.go | 18 +- internal/app/triggermessageprocessor.go | 24 +- internal/app/triggermessageprocessor_test.go | 14 +- internal/appfunction/context.go | 20 +- internal/appfunction/context_test.go | 32 +- internal/bootstrap/container/config.go | 4 +- internal/bootstrap/container/storeclient.go | 4 +- internal/bootstrap/handlers/version.go | 20 +- internal/bootstrap/handlers/version_test.go | 22 +- internal/common/config.go | 2 +- internal/constant.go | 2 +- internal/runtime/runtime.go | 26 +- internal/runtime/runtime_test.go | 18 +- internal/runtime/storeforward.go | 16 +- internal/runtime/storeforward_test.go | 24 +- internal/store/db/models/storedobject.go | 2 +- internal/store/db/models/storedobject_test.go | 2 +- internal/store/db/postgres/client.go | 6 +- internal/store/db/postgres/client_test.go | 6 +- internal/store/db/postgres/store.go | 6 +- internal/store/db/postgres/store_test.go | 4 +- internal/store/db/postgres/utils.go | 2 +- internal/store/db/redis/store.go | 6 +- internal/store/db/redis/store_test.go | 6 +- internal/trigger/http/rest.go | 16 +- internal/trigger/http/rest_test.go | 18 +- internal/trigger/messagebus/messaging.go | 24 +- internal/trigger/messagebus/messaging_test.go | 20 +- internal/trigger/messageprocessor.go | 4 +- internal/trigger/mocks/MessageProcessor.go | 4 +- internal/trigger/mocks/ServiceBinding.go | 14 +- internal/trigger/mqtt/mqtt.go | 24 +- internal/trigger/mqtt/mqtt_test.go | 18 +- internal/trigger/servicebinding.go | 14 +- internal/webserver/server.go | 26 +- internal/webserver/server_test.go | 14 +- pkg/factory.go | 18 +- pkg/factory_test.go | 6 +- pkg/interfaces/backgroundmessage.go | 2 +- pkg/interfaces/context.go | 8 +- pkg/interfaces/mocks/AppFunctionContext.go | 10 +- pkg/interfaces/mocks/ApplicationService.go | 12 +- pkg/interfaces/mocks/BackgroundPublisher.go | 2 +- pkg/interfaces/mocks/StoreClient.go | 2 +- pkg/interfaces/mocks/Trigger.go | 4 +- pkg/interfaces/mocks/TriggerContextBuilder.go | 4 +- .../mocks/TriggerMessageProcessor.go | 4 +- pkg/interfaces/service.go | 12 +- pkg/interfaces/trigger.go | 6 +- pkg/secure/mqttfactory.go | 4 +- pkg/secure/mqttfactory_test.go | 10 +- pkg/transforms/aesprotection.go | 8 +- pkg/transforms/aesprotection_test.go | 12 +- pkg/transforms/batch.go | 8 +- pkg/transforms/batch_test.go | 4 +- pkg/transforms/compression.go | 8 +- pkg/transforms/compression_test.go | 4 +- pkg/transforms/conversion.go | 6 +- pkg/transforms/conversion_test.go | 4 +- pkg/transforms/event.go | 10 +- pkg/transforms/event_test.go | 6 +- pkg/transforms/filter.go | 6 +- pkg/transforms/filter_test.go | 6 +- pkg/transforms/helpers.go | 2 +- pkg/transforms/helpers_test.go | 6 +- pkg/transforms/http.go | 8 +- pkg/transforms/http_test.go | 6 +- pkg/transforms/jsonlogic.go | 4 +- pkg/transforms/metrics.go | 4 +- pkg/transforms/metrics_test.go | 4 +- pkg/transforms/mqttsecret.go | 16 +- pkg/transforms/responsedata.go | 4 +- pkg/transforms/responsedata_test.go | 4 +- pkg/transforms/stringvaluesformatter.go | 2 +- pkg/transforms/stringvaluesformatter_test.go | 4 +- pkg/transforms/tags.go | 4 +- pkg/transforms/tags_test.go | 2 +- pkg/transforms/testmain_test.go | 16 +- pkg/util/helpers_test.go | 2 +- 102 files changed, 701 insertions(+), 1052 deletions(-) diff --git a/app-service-template/Attribution.txt b/app-service-template/Attribution.txt index b1364729b..5be797297 100644 --- a/app-service-template/Attribution.txt +++ b/app-service-template/Attribution.txt @@ -1,259 +1,79 @@ The following open source projects are referenced by app-service-configurable: -armon/go-metrics (MIT) https://github.com/armon/go-metrics -https://github.com/armon/go-metrics/blob/master/LICENSE - -cenkalti/backoff (MIT) https://github.com/cenkalti/backoff -https://github.com/cenkalti/backoff/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/app-functions-sdk-go (Apache 2.0) https://github.com/edgexfoundry/app-functions-sdk-go/v3 +edgexfoundry/app-functions-sdk-go (Apache 2.0) https://github.com/edgexfoundry/app-functions-sdk-go/v4 https://github.com/edgexfoundry/app-functions-sdk-go/blob/main/LICENSE -edgexfoundry/go-mod-core-contracts (Apache 2.0) https://github.com/edgexfoundry/go-mod-core-contracts/v3 +edgexfoundry/go-mod-core-contracts (Apache 2.0) https://github.com/edgexfoundry/go-mod-core-contracts/v4 https://github.com/edgexfoundry/go-mod-core-contracts/blob/main/LICENSE -edgexfoundry/go-mod-registry (Apache 2.0) https://github.com/edgexfoundry/go-mod-registry/v3 -https://github.com/edgexfoundry/go-mod-registry/blob/main/LICENSE - -edgexfoundry/go-mod-messaging (Apache 2.0) https://github.com/edgexfoundry/go-mod-messaging/v3 -https://github.com/edgexfoundry/go-mod-messaging/blob/main/LICENSE - -edgexfoundry/go-mod-secrets (Apache 2.0) https://github.com/edgexfoundry/go-mod-secrets/v3 -https://github.com/edgexfoundry/go-mod-secrets/blob/main/LICENSE - -edgexfoundry/go-mod-secrets (Apache 2.0) https://github.com/edgexfoundry/go-mod-bootstrap/v3 -https://github.com/edgexfoundry/go-mod-bootstrap/blob/main/LICENSE - -edgexfoundry/go-mod-secrets (Apache 2.0) https://github.com/edgexfoundry/go-mod-configuration/v3 -https://github.com/edgexfoundry/go-mod-configuration/blob/main/LICENSE - -go-logfmt/logfmt (MIT) https://github.com/go-logfmt/logfmt -https://github.com/go-logfmt/logfmt/blob/master/LICENSE - google/uuid (BSD-3) https://github.com/google/uuid https://github.com/google/uuid/blob/master/LICENSE -hashicorp/consul/api (Mozilla Public License 2.0) - https://github.com/hashicorp/consul/api -https://github.com/hashicorp/consul/blob/master/LICENSE - -hashicorp/errwrap (Mozilla Public License 2.0) https://github.com/hashicorp/errwrap -https://github.com/hashicorp/errwrap/blob/master/LICENSE - -hashicorp/go-cleanhttp (Mozilla Public License 2.0) - https://github.com/hashicorp/go-cleanhttp -https://github.com/hashicorp/go-cleanhttp/blob/master/LICENSE - -hashicorp/go-immutable-radix (Mozilla Public License 2.0) https://github.com/hashicorp/go-immutable-radix -https://github.com/hashicorp/go-immutable-radix/blob/master/LICENSE - -hashicorp/go-multierror (Mozilla Public License 2.0) https://github.com/hashicorp/go-multierror -https://github.com/hashicorp/go-multierror/blob/master/LICENSE - -hashicorp/go-rootcerts (Mozilla Public License 2.0) https://github.com/hashicorp/go-rootcerts -https://github.com/hashicorp/go-rootcerts/blob/master/LICENSE - -hashicorp/golang-lru (Mozilla Public License 2.0) https://github.com/hashicorp/golang-lru -https://github.com/hashicorp/golang-lru/blob/master/LICENSE - -hashicorp/serf (Mozilla Public License 2.0) https://github.com/hashicorp/serf -https://github.com/hashicorp/serf/blob/master/LICENSE - -kr/logfmt (Unspecified) https://github.com/kr/logfmt -https://github.com/kr/logfmt/blob/master/Readme - -mitchellh/consulstructure (MIT) https://github.com/mitchellh/consulstructure -https://github.com/mitchellh/consulstructure/blob/master/LICENSE - -mitchellh/mapstructure (MIT) https://github.com/mitchellh/mapstructure -https://github.com/mitchellh/mapstructure/blob/master/LICENSE - -mitchellh/copystructure (MIT) https://github.com/mitchellh/copystructure -https://github.com/mitchellh/copystructure/blob/master/LICENSE - -mitchellh/reflectwalk (MIT) https://github.com/mitchellh/reflectwalk -https://github.com/mitchellh/reflectwalk/blob/master/LICENSE - -mitchellh/go-homedir (MIT) https://github.com/mitchellh/go-homedir -https://github.com/mitchellh/go-homedir/blob/master/LICENSE - -fxamacker/cbor/v2 (MIT) https://github.com/fxamacker/cbor/v2 -https://github.com/fxamacker/cbor/blob/master/LICENSE - -x448/float16 (MIT) https://github.com/x448/float16 -https://github.com/x448/float16/blob/master/LICENSE - -golang.org/x/net (Unspecified) https://github.com/golang/net -https://github.com/golang/net/blob/master/LICENSE - -gomodule/redigo (Apache 2.0) https://github.com/gomodule/redigo -https://github.com/gomodule/redigo/blob/master/LICENSE - -github.com/go-stack/stack (MIT) https://github.com/go-stack/stack -https://github.com/go-stack/stack/blob/master/LICENSE.md - -github.com/golang/snappy (BSD-3) https://github.com/golang/snappy -https://github.com/golang/snappy/blob/master/LICENSE - -github.com/xdg/scram (Apache 2.0) https://github.com/xdg-go/scram -https://github.com/xdg-go/scram/blob/master/LICENSE - -github.com/xdg/stringprep (Apache 2.0) https://github.com/xdg-go/stringprep -https://github.com/xdg-go/stringprep/blob/master/LICENSE - -go.mongodb.org/mongo-driver (Apache 2.0) https://github.com/mongodb/mongo-go-driver -https://github.com/mongodb/mongo-go-driver/blob/master/LICENSE - -golang.org/x/crypto (Unspecified) https://github.com/golang/crypto -https://github.com/golang/crypto/blob/master/LICENSE - -golang.org/x/sync (Unspecified) https://github.com/golang/sync -https://github.com/golang/sync/blob/master/LICENSE - -golang.org/x/text (Unspecified) https://github.com/golang/text -https://github.com/golang/text/blob/master/LICENSE - -golang.org/x/time (Unspecified) https://github.com/golang/time -https://github.com/golang/text/blob/master/LICENSE - -github.com/diegoholiveira/jsonlogic/v3 (MIT) https://github.com/diegoholiveira/ -https://github.com/diegoholiveira/jsonlogic/blob/master/LICENSE - -github.com/go-redis/redis/v7 (BSD-2) https://github.com/go-redis/redis -https://github.com/go-redis/redis/blob/master/LICENSE - -go-playground/locales (MIT) https://github.com/go-playground/locales -https://github.com/go-playground/locales/blob/master/LICENSE - -go-playground/universal-translator (MIT) https://github.com/go-playground/universal-translator -https://github.com/go-playground/universal-translator/blob/master/LICENSE - -github.com/go-playground/validator/v10 (MIT) https://github.com/go-playground/validator -https://github.com/go-playground/validator/blob/master/LICENSE - -leodido/go-urn (MIT) https://github.com/leodido/go-urn -https://github.com/leodido/go-urn - -stretchr/testify (MIT) https://github.com/stretchr/testify -https://github.com/stretchr/testify/blob/master/LICENSE - -pmezard/go-difflib (Unspecified) https://github.com/pmezard/go-difflib -https://github.com/pmezard/go-difflib/blob/master/LICENSE - -davecgh/go-spew (ISC) https://github.com/davecgh/go-spew -https://github.com/davecgh/go-spew/blob/master/LICENSE - -gopkg.in/yaml.v3 (MIT) https://github.com/go-yaml/yaml/ -https://github.com/go-yaml/yaml/blob/v3/LICENSE - -github.com/fatih/color (MIT) https://github.com/fatih/color -https://github.com/fatih/color/blob/master/LICENSE.md - -github.com/hashicorp/go-hclog (MIT) https://github.com/hashicorp/go-hclog -https://github.com/hashicorp/go-hclog/blob/master/LICENSE - -github.com/mattn/go-colorable (MIT) https://github.com/mattn/go-colorable -https://github.com/mattn/go-colorable/blob/master/LICENSE - -github.com/mattn/go-isatty (MIT) https://github.com/mattn/go-isatty -https://github.com/mattn/go-isatty/blob/master/LICENSE - -golang.org/x/sys (Unspecified) https://github.com/golang/sys -https://github.com/golang/sys/blob/master/LICENSE - -stretchr/objx (MIT) https://github.com/stretchr/objx -https://github.com/stretchr/objx/blob/master/LICENSE - -github.com/gorilla/websocket (BSD-2) https://github.com/gorilla/websocket -https://github.com/gorilla/websocket/blob/master/LICENSE - -github.com/go-kit/log (MIT) https://github.com/go-kit/log -https://github.com/go-kit/log/blob/main/LICENSE +github.com/labstack/echo/v4 (MIT) https://github.com/labstack/echo +https://github.com/labstack/echo/blob/master/LICENSE rcrowley/go-metrics (Unspecified) https://github.com/rcrowley/go-metrics https://github.com/rcrowley/go-metrics/blob/master/LICENSE -github.com/golang/protobuf (BSD-3) https://github.com/golang/protobuf -https://github.com/golang/protobuf/blob/master/LICENSE - -github.com/spiffe/go-spiffe/v2 (Apache-2.0 License) github.com/spiffe/go-spiffe/v2 -https://github.com/spiffe/go-spiffe/blob/main/LICENSE - -github.com/zeebo/errs (MIT) https://github.com/zeebo/errs -https://github.com/zeebo/errs/blob/master/LICENSE - -google.golang.org/genproto (Apache-2.0) https://github.com/googleapis/go-genproto -https://github.com/googleapis/go-genproto/blob/main/LICENSE - -google.golang.org/grpc (Apache-2.0) https://github.com/grpc/grpc-go -https://github.com/grpc/grpc-go/blob/master/LICENSE - -google.golang.org/protobuf (Unspecified) https://github.com/protocolbuffers/protobuf-go -https://github.com/protocolbuffers/protobuf-go/blob/master/LICENSE - -gopkg.in/square/go-jose.v2 (Apache-2.0) https://github.com/square/go-jose/tree/v2.6.0 -https://github.com/square/go-jose/blob/v2.6.0/LICENSE +stretchr/testify (MIT) https://github.com/stretchr/testify +https://github.com/stretchr/testify/blob/master/LICENSE github.com/Microsoft/go-winio (MIT) https://github.com/Microsoft/go-winio https://github.com/microsoft/go-winio/blob/master/LICENSE -github.com/nats-io/nats.go (Apache-2.0) https://github.com/nats-io/nats.go -https://github.com/nats-io/nats.go/blob/main/LICENSE - -github.com/nats-io/nkeys (Apache-2.0) https://github.com/nats-io/nkeys -https://github.com/nats-io/nkeys/blob/master/LICENSE +github.com/asaskevich/govalidator (MIT) - https://github.com/asaskevich/govalidator +https://github.com/asaskevich/govalidator/blob/master/LICENSE -github.com/nats-io/nuid (Apache-2.0) https://github.com/nats-io/nuid -https://github.com/nats-io/nuid/blob/master/LICENSE +github.com/barkimedes/go-deepcopy (MIT) https://github.com/barkimedes/go-deepcopy +https://github.com/barkimedes/go-deepcopy/blob/master/LICENSE -golang.org/x/mod (BSD-3) https://github.com/golang/mod -https://github.com/golang/mod/blob/master/LICENSE +github.com/cenkalti/backoff/v4 (MIT) - https://github.com/cenkalti/backoff +https://github.com/cenkalti/backoff/blob/v4/LICENSE -golang.org/x/tools (BSD-3) https://github.com/golang/tools -https://github.com/golang/tools/blob/master/LICENSE +davecgh/go-spew (ISC) https://github.com/davecgh/go-spew +https://github.com/davecgh/go-spew/blob/master/LICENSE -golang.org/x/exp (BSD-3) https://github.com/golang/tools -https://github.com/golang/tools/blob/master/LICENSE +github.com/diegoholiveira/jsonlogic/v3 (MIT) https://github.com/diegoholiveira/ +https://github.com/diegoholiveira/jsonlogic/blob/master/LICENSE -github.com/go-jose/go-jose/v3 (Apache-2.0) https://github.com/go-jose/go-jose -https://github.com/go-jose/go-jose/blob/v3/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 -github.com/klauspost/compress (Apache-2.0) https://github.com/klauspost/compress -https://github.com/klauspost/compress/blob/master/LICENSE +edgexfoundry/go-mod-secrets (Apache 2.0) https://github.com/edgexfoundry/go-mod-bootstrap/v4 +https://github.com/edgexfoundry/go-mod-bootstrap/blob/main/LICENSE -github.com/gabriel-vasile/mimetype (MIT) https://github.com/gabriel-vasile/mimetype -https://github.com/gabriel-vasile/mimetype/blob/master/LICENSE +edgexfoundry/go-mod-secrets (Apache 2.0) https://github.com/edgexfoundry/go-mod-configuration/v4 +https://github.com/edgexfoundry/go-mod-configuration/blob/main/LICENSE -github.com/golang-jwt/jwt/v4 (MIT) github.com/golang-jwt/jwt -https://github.com/golang-jwt/jwt/blob/main/LICENSE +edgexfoundry/go-mod-messaging (Apache 2.0) https://github.com/edgexfoundry/go-mod-messaging/v4 +https://github.com/edgexfoundry/go-mod-messaging/blob/main/LICENSE -github.com/labstack/echo/v4 (MIT) https://github.com/labstack/echo -https://github.com/labstack/echo/blob/master/LICENSE +edgexfoundry/go-mod-registry (Apache 2.0) https://github.com/edgexfoundry/go-mod-registry/v4 +https://github.com/edgexfoundry/go-mod-registry/blob/main/LICENSE -github.com/labstack/gommon (MIT) https://github.com/labstack/gommon -https://github.com/labstack/gommon/blob/master/LICENSE +edgexfoundry/go-mod-secrets (Apache 2.0) https://github.com/edgexfoundry/go-mod-secrets/v4 +https://github.com/edgexfoundry/go-mod-secrets/blob/main/LICENSE -github.com/valyala/fasttemplate (MIT) https://github.com/valyala/fasttemplate -https://github.com/valyala/fasttemplate/blob/master/LICENSE +github.com/fsnotify/fsnotify (BSD-3) - REPOURL +https://github.com/fsnotify/fsnotify/blob/main/LICENSE -github.com/valyala/bytebufferpool (MIT) https://github.com/valyala/bytebufferpool -https://github.com/valyala/bytebufferpool/blob/master/LICENSE +github.com/fullsailor/pkcs7 (MIT) - https://github.com/fullsailor/pkcs7 +https://github.com/fullsailor/pkcs7/blob/master/LICENSE -google.golang.org/genproto/googleapis/rpc (Apache-2.0) https://pkg.go.dev/google.golang.org/genproto -https://pkg.go.dev/google.golang.org/genproto?tab=licenses +fxamacker/cbor/v2 (MIT) https://github.com/fxamacker/cbor/v2 +https://github.com/fxamacker/cbor/blob/master/LICENSE -github.com/asaskevich/govalidator (MIT) - https://github.com/asaskevich/govalidator -https://github.com/asaskevich/govalidator/blob/master/LICENSE +github.com/gabriel-vasile/mimetype (MIT) https://github.com/gabriel-vasile/mimetype +https://github.com/gabriel-vasile/mimetype/blob/master/LICENSE -github.com/cenkalti/backoff/v4 (MIT) - https://github.com/cenkalti/backoff -https://github.com/cenkalti/backoff/blob/v4/LICENSE +github.com/go-jose/go-jose/v4 (Apache-2.0) https://github.com/go-jose/go-jose +https://github.com/go-jose/go-jose/blob/main/LICENSE -github.com/fsnotify/fsnotify (BSD-3) - REPOURL -https://github.com/fsnotify/fsnotify/blob/main/LICENSE +github.com/go-kit/log (MIT) https://github.com/go-kit/log +https://github.com/go-kit/log/blob/main/LICENSE -github.com/fullsailor/pkcs7 (MIT) - https://github.com/fullsailor/pkcs7 -https://github.com/fullsailor/pkcs7/blob/master/LICENSE +go-logfmt/logfmt (MIT) https://github.com/go-logfmt/logfmt +https://github.com/go-logfmt/logfmt/blob/master/LICENSE github.com/go-logr/logr (Apache 2.0) - https://github.com/go-logr/logr https://github.com/go-logr/logr/blob/master/LICENSE @@ -294,12 +114,30 @@ https://github.com/go-openapi/swag/blob/master/LICENSE github.com/go-openapi/validate (Apache 2.0) - https://github.com/go-openapi/validate https://github.com/go-openapi/validate/blob/master/LICENSE +go-playground/locales (MIT) https://github.com/go-playground/locales +https://github.com/go-playground/locales/blob/master/LICENSE + +go-playground/universal-translator (MIT) https://github.com/go-playground/universal-translator +https://github.com/go-playground/universal-translator/blob/master/LICENSE + +github.com/go-playground/validator/v10 (MIT) https://github.com/go-playground/validator +https://github.com/go-playground/validator/blob/master/LICENSE + +github.com/go-redis/redis/v7 (BSD-2) https://github.com/go-redis/redis +https://github.com/go-redis/redis/blob/master/LICENSE + github.com/go-resty/resty/v2 (MIT) - https://github.com/go-resty/resty https://github.com/go-resty/resty/blob/v2/LICENSE -github.com/golang-jwt/jwt/v5 (MIT) - https://github.com/golang-jwt/jwt +github.com/golang-jwt/jwt/v5 (MIT) - https://github.com/golang-jwt/jwt/v5 https://github.com/golang-jwt/jwt/blob/main/LICENSE +github.com/golang/protobuf (BSD-3) https://github.com/golang/protobuf +https://github.com/golang/protobuf/blob/master/LICENSE + +gomodule/redigo (Apache 2.0) https://github.com/gomodule/redigo +https://github.com/gomodule/redigo/blob/master/LICENSE + github.com/gorilla/mux (BSD-3) - https://github.com/gorilla/mux https://github.com/gorilla/mux/blob/main/LICENSE @@ -309,18 +147,57 @@ https://github.com/gorilla/schema/blob/main/LICENSE github.com/gorilla/securecookie (BSD-3) - https://github.com/gorilla/securecookie https://github.com/gorilla/securecookie/blob/main/LICENSE +github.com/gorilla/websocket (BSD-2) https://github.com/gorilla/websocket +https://github.com/gorilla/websocket/blob/master/LICENSE + +hashicorp/errwrap (Mozilla Public License 2.0) https://github.com/hashicorp/errwrap +https://github.com/hashicorp/errwrap/blob/master/LICENSE + +hashicorp/go-multierror (Mozilla Public License 2.0) https://github.com/hashicorp/go-multierror +https://github.com/hashicorp/go-multierror/blob/master/LICENSE + +github.com/jackc/pgerrcode (MIT) https://github.com/jackc/pgerrcode +https://github.com/jackc/pgerrcode/blob/master/LICENSE + +github.com/jackc/pgpassfile (MIT) https://github.com/jackc/pgpassfile +https://github.com/jackc/pgpassfile/blob/master/LICENSE + +github.com/jackc/pgservicefile (MIT) https://github.com/jackc/pgservicefile +https://github.com/jackc/pgservicefile/blob/master/LICENSE + +github.com/jackc/pgx/v5 (MIT) https://github.com/jackc/pgx +https://github.com/jackc/pgx/blob/master/LICENSE + +github.com/jackc/puddle/v2 (MIT) https://github.com/jackc/puddle +https://github.com/jackc/puddle/blob/master/LICENSE + github.com/josharian/intern (MIT) - https://github.com/josharian/intern https://github.com/josharian/intern/blob/master/LICENSE.md github.com/kataras/go-events (MIT) - https://github.com/kataras/go-events https://github.com/kataras/go-events/blob/master/LICENSE +github.com/klauspost/compress (Apache-2.0) https://github.com/klauspost/compress +https://github.com/klauspost/compress/blob/master/LICENSE + +github.com/labstack/gommon (MIT) https://github.com/labstack/gommon +https://github.com/labstack/gommon/blob/master/LICENSE + +leodido/go-urn (MIT) https://github.com/leodido/go-urn +https://github.com/leodido/go-urn + github.com/lufia/plan9stats (BSD-3) - https://github.com/lufia/plan9stats https://github.com/lufia/plan9stats/blob/main/LICENSE github.com/mailru/easyjson (MIT) - https://github.com/mailru/easyjson https://github.com/mailru/easyjson/blob/master/LICENSE +github.com/mattn/go-colorable (MIT) https://github.com/mattn/go-colorable +https://github.com/mattn/go-colorable/blob/master/LICENSE + +github.com/mattn/go-isatty (MIT) https://github.com/mattn/go-isatty +https://github.com/mattn/go-isatty/blob/master/LICENSE + github.com/mgutz/ansi (MIT) - https://github.com/mgutz/ansi https://github.com/mgutz/ansi/blob/master/LICENSE @@ -330,19 +207,37 @@ https://github.com/michaelquigley/pfxlog/blob/main/LICENSE github.com/miekg/pkcs11 (BSD-3) - https://github.com/miekg/pkcs11 https://github.com/miekg/pkcs11/blob/master/LICENSE +mitchellh/copystructure (MIT) https://github.com/mitchellh/copystructure +https://github.com/mitchellh/copystructure/blob/master/LICENSE + github.com/mitchellh/go-ps (MIT) - https://github.com/mitchellh/go-ps https://github.com/mitchellh/go-ps/blob/master/LICENSE.md +mitchellh/mapstructure (MIT) https://github.com/mitchellh/mapstructure +https://github.com/mitchellh/mapstructure/blob/master/LICENSE + +mitchellh/reflectwalk (MIT) https://github.com/mitchellh/reflectwalk +https://github.com/mitchellh/reflectwalk/blob/master/LICENSE + github.com/muhlemmer/gu (The Unlicense) - https://github.com/muhlemmer/gu https://github.com/muhlemmer/gu/blob/main/LICENSE +github.com/nats-io/nats.go (Apache-2.0) https://github.com/nats-io/nats.go +https://github.com/nats-io/nats.go/blob/main/LICENSE + +github.com/nats-io/nkeys (Apache-2.0) https://github.com/nats-io/nkeys +https://github.com/nats-io/nkeys/blob/master/LICENSE + +github.com/nats-io/nuid (Apache-2.0) https://github.com/nats-io/nuid +https://github.com/nats-io/nuid/blob/master/LICENSE + github.com/oklog/ulid (Apache 2.0) - https://github.com/oklog/ulid https://github.com/oklog/ulid/blob/main/LICENSE github.com/opentracing/opentracing-go (Apache 2.0) - https://github.com/opentracing/opentracing-go https://github.com/opentracing/opentracing-go/blob/master/LICENSE -github.com/openziti/channel/v2 (Apache 2.0) - https://github.com/openziti/channel +github.com/openziti/channel/v3 (Apache 2.0) - github.com/openziti/channel/v3 https://github.com/openziti/channel/blob/main/LICENSE github.com/openziti/edge-api (Apache 2.0) - https://github.com/openziti/edge-api @@ -375,6 +270,9 @@ https://github.com/parallaxsecond/parsec-client-go/blob/main/LICENSE github.com/pkg/errors (BSD-2) - https://github.com/pkg/errors https://github.com/pkg/errors/blob/master/LICENSE +pmezard/go-difflib (Unspecified) https://github.com/pmezard/go-difflib +https://github.com/pmezard/go-difflib/blob/master/LICENSE + github.com/power-devops/perfstat (MIT) - https://github.com/power-devops/perfstat https://github.com/power-devops/perfstat/blob/main/LICENSE @@ -390,15 +288,36 @@ https://github.com/sirupsen/logrus/blob/master/LICENSE github.com/speps/go-hashids (MIT) - https://github.com/speps/go-hashids https://github.com/speps/go-hashids/blob/master/LICENSE +spf13/cast (MIT) https://github.com/spf13/cast +https://github.com/spf13/cast/blob/master/LICENSE + +github.com/spiffe/go-spiffe/v2 (Apache-2.0 License) github.com/spiffe/go-spiffe/v2 +https://github.com/spiffe/go-spiffe/blob/main/LICENSE + +stretchr/objx (MIT) https://github.com/stretchr/objx +https://github.com/stretchr/objx/blob/master/LICENSE + github.com/tklauser/go-sysconf (BSD-3) - https://github.com/tklauser/go-sysconf https://github.com/tklauser/go-sysconf/blob/main/LICENSE github.com/tklauser/numcpus (Apache 2.0) - https://github.com/tklauser/numcpus https://github.com/tklauser/numcpus/blob/main/LICENSE +github.com/valyala/bytebufferpool (MIT) https://github.com/valyala/bytebufferpool +https://github.com/valyala/bytebufferpool/blob/master/LICENSE + +github.com/valyala/fasttemplate (MIT) https://github.com/valyala/fasttemplate +https://github.com/valyala/fasttemplate/blob/master/LICENSE + +x448/float16 (MIT) https://github.com/x448/float16 +https://github.com/x448/float16/blob/master/LICENSE + github.com/yusufpapurcu/wmi (MIT) - https://github.com/yusufpapurcu/wmi https://github.com/yusufpapurcu/wmi/blob/master/LICENSE +github.com/zeebo/errs (MIT) https://github.com/zeebo/errs +https://github.com/zeebo/errs/blob/master/LICENSE + github.com/zitadel/oidc/v2 (Apache 2.0) - https://github.com/zitadel/oidc https://github.com/zitadel/oidc/blob/main/LICENSE @@ -417,47 +336,47 @@ https://github.com/open-telemetry/opentelemetry-go/blob/main/LICENSE go.opentelemetry.io/otel/trace (Apache 2.0) - https://github.com/open-telemetry/opentelemetry-go https://github.com/open-telemetry/opentelemetry-go/blob/main/LICENSE -golang.org/x/oauth2 (Unspecified) - https://cs.opensource.google/go/x/oauth2 -https://cs.opensource.google/go/x/oauth2/+/master:LICENSE - -golang.org/x/term (Unspecified) - https://cs.opensource.google/go/x/term -https://cs.opensource.google/go/x/term/+/master:LICENSE - -google.golang.org/appengine (Apache 2.0) - https://github.com/golang/appengine -https://github.com/golang/appengine/blob/master/LICENSE +golang.org/x/crypto (Unspecified) https://github.com/golang/crypto +https://github.com/golang/crypto/blob/master/LICENSE -google.golang.org/genproto/googleapis/rpc (Apache 2.0) - https://github.com/googleapis/go-genproto -https://github.com/googleapis/go-genproto/blob/main/LICENSE +golang.org/x/exp (BSD-3) https://github.com/golang/tools +https://github.com/golang/tools/blob/master/LICENSE -nhooyr.io/websocket (ISC License) - https://github.com/nhooyr/websocket -https://github.com/nhooyr/websocket/blob/master/LICENSE.txt +golang.org/x/net (Unspecified) https://github.com/golang/net +https://github.com/golang/net/blob/master/LICENSE -github.com/barkimedes/go-deepcopy (MIT) https://github.com/barkimedes/go-deepcopy -https://github.com/barkimedes/go-deepcopy/blob/master/LICENSE +golang.org/x/oauth2 (Unspecified) - https://cs.opensource.google/go/x/oauth2 +https://cs.opensource.google/go/x/oauth2/+/master:LICENSE -github.com/go-jose/go-jose/v4 (Apache-2.0) https://github.com/go-jose/go-jose -https://github.com/go-jose/go-jose/blob/main/LICENSE +golang.org/x/sync (Unspecified) https://github.com/golang/sync +https://github.com/golang/sync/blob/master/LICENSE -github.com/jackc/pgerrcode (MIT) https://github.com/jackc/pgerrcode -https://github.com/jackc/pgerrcode/blob/master/LICENSE +golang.org/x/sys (Unspecified) https://github.com/golang/sys +https://github.com/golang/sys/blob/master/LICENSE -github.com/jackc/pgpassfile (MIT) https://github.com/jackc/pgpassfile -https://github.com/jackc/pgpassfile/blob/master/LICENSE +golang.org/x/term (Unspecified) - https://cs.opensource.google/go/x/term +https://cs.opensource.google/go/x/term/+/master:LICENSE -github.com/jackc/pgservicefile (MIT) https://github.com/jackc/pgservicefile -https://github.com/jackc/pgservicefile/blob/master/LICENSE +golang.org/x/text (Unspecified) https://github.com/golang/text +https://github.com/golang/text/blob/master/LICENSE -github.com/jackc/pgx/v5 (MIT) https://github.com/jackc/pgx -https://github.com/jackc/pgx/blob/master/LICENSE +golang.org/x/time (Unspecified) https://github.com/golang/time +https://github.com/golang/text/blob/master/LICENSE -github.com/jackc/puddle/v2 (MIT) https://github.com/jackc/puddle -https://github.com/jackc/puddle/blob/master/LICENSE +google.golang.org/genproto/googleapis/rpc (Apache-2.0) https://pkg.go.dev/google.golang.org/genproto +https://pkg.go.dev/google.golang.org/genproto?tab=licenses -github.com/openziti/channel/v3 (Apache 2.0) - github.com/openziti/channel/v3 -https://github.com/openziti/channel/blob/main/LICENSE +google.golang.org/grpc (Apache-2.0) https://github.com/grpc/grpc-go +https://github.com/grpc/grpc-go/blob/master/LICENSE -spf13/cast (MIT) https://github.com/spf13/cast -https://github.com/spf13/cast/blob/master/LICENSE +google.golang.org/protobuf (Unspecified) https://github.com/protocolbuffers/protobuf-go +https://github.com/protocolbuffers/protobuf-go/blob/master/LICENSE gopkg.in/go-jose/go-jose.v2 (Apache 2.0) - https://github.com/go-jose/go-jose https://github.com/go-jose/go-jose/blob/v2.6.3/LICENSE + +gopkg.in/yaml.v3 (MIT) https://github.com/go-yaml/yaml/ +https://github.com/go-yaml/yaml/blob/v4/LICENSE + +nhooyr.io/websocket (ISC License) - https://github.com/nhooyr/websocket +https://github.com/nhooyr/websocket/blob/master/LICENSE.txt diff --git a/app-service-template/Dockerfile b/app-service-template/Dockerfile index abafbeaa6..24184eef4 100644 --- a/app-service-template/Dockerfile +++ b/app-service-template/Dockerfile @@ -53,4 +53,4 @@ COPY --from=builder /app/app-new-service /app-new-service EXPOSE 59740 ENTRYPOINT ["/app-new-service"] -CMD ["-cp=consul.http://edgex-core-consul:8500", "--registry"] +CMD ["-cp=keeper.http://edgex-core-keeper:59890", "--registry"] diff --git a/app-service-template/Makefile b/app-service-template/Makefile index 707005e92..a0d48d644 100644 --- a/app-service-template/Makefile +++ b/app-service-template/Makefile @@ -34,7 +34,7 @@ APPVERSION=$(shell cat ./VERSION 2>/dev/null || echo 0.0.0) SDKVERSION=$(shell cat ./go.mod | grep 'github.com/edgexfoundry/app-functions-sdk-go/v3 v' | sed 's/require//g' | awk '{print $$2}') MICROSERVICE=app-new-service -GOFLAGS=-ldflags "-s -w -X github.com/edgexfoundry/app-functions-sdk-go/v3/internal.SDKVersion=$(SDKVERSION) -X github.com/edgexfoundry/app-functions-sdk-go/v3/internal.ApplicationVersion=$(APPVERSION)" -trimpath -mod=readonly +GOFLAGS=-ldflags "-s -w -X github.com/edgexfoundry/app-functions-sdk-go/v4/internal.SDKVersion=$(SDKVERSION) -X github.com/edgexfoundry/app-functions-sdk-go/v4/internal.ApplicationVersion=$(APPVERSION)" -trimpath -mod=readonly # TODO: uncomment and remove default once files are in a Github repository or # remove totally including usage below diff --git a/app-service-template/config/configuration.go b/app-service-template/config/configuration.go index 439378de2..60e30f223 100644 --- a/app-service-template/config/configuration.go +++ b/app-service-template/config/configuration.go @@ -18,7 +18,7 @@ package config // This file contains example of custom configuration that can be loaded from the service's configuration.yaml -// and/or the Configuration Provider, aka Consul (if enabled). +// and/or the Configuration Provider, aka keeper (if enabled). // For more details see https://docs.edgexfoundry.org/latest/microservices/application/GeneralAppServiceConfig/#custom-configuration // TODO: Update this configuration as needed for you service's needs and remove this comment // or remove this file if not using custom configuration. @@ -38,7 +38,7 @@ type ServiceConfig struct { } // AppCustomConfig is example of service's custom structured configuration that is specified in the service's -// configuration.yaml file and Configuration Provider (aka Consul), if enabled. +// configuration.yaml file and Configuration Provider (aka keeper), if enabled. type AppCustomConfig struct { ResourceNames string SomeValue int diff --git a/app-service-template/functions/sample.go b/app-service-template/functions/sample.go index 3842ea45d..fda634405 100644 --- a/app-service-template/functions/sample.go +++ b/app-service-template/functions/sample.go @@ -24,10 +24,10 @@ import ( gometrics "github.com/rcrowley/go-metrics" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" - "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/v4/common" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos" ) // TODO: Remove sample metric and implement meaningful metrics if any needed. diff --git a/app-service-template/functions/sample_test.go b/app-service-template/functions/sample_test.go index 5cfee7a76..66656a2ae 100644 --- a/app-service-template/functions/sample_test.go +++ b/app-service-template/functions/sample_test.go @@ -21,15 +21,15 @@ import ( "os" "testing" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces/mocks" - mocks2 "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" - "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" - edgexErrors "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces/mocks" + mocks2 "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/interfaces/mocks" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v4/common" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos/responses" + edgexErrors "github.com/edgexfoundry/go-mod-core-contracts/v4/errors" "github.com/stretchr/testify/mock" "github.com/google/uuid" diff --git a/app-service-template/go.mod b/app-service-template/go.mod index 90ee3d5b6..e9a3c68fc 100644 --- a/app-service-template/go.mod +++ b/app-service-template/go.mod @@ -6,11 +6,11 @@ go 1.23 // To build local docker image of the template App you must // comment out this replace statement and update the SDK version to latest -replace github.com/edgexfoundry/app-functions-sdk-go/v3 => ../ +replace github.com/edgexfoundry/app-functions-sdk-go/v4 => ../ require ( - github.com/edgexfoundry/app-functions-sdk-go/v3 v3.1.1 - github.com/edgexfoundry/go-mod-core-contracts/v3 v3.2.0-dev.53 + github.com/edgexfoundry/app-functions-sdk-go/v4 v4.0.0 + github.com/edgexfoundry/go-mod-core-contracts/v4 v4.0.0-dev.2 github.com/google/uuid v1.6.0 github.com/labstack/echo/v4 v4.12.0 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 @@ -19,20 +19,17 @@ require ( require ( github.com/Microsoft/go-winio v0.6.2 // indirect - github.com/armon/go-metrics v0.4.1 // indirect github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df // indirect - github.com/cenkalti/backoff v2.2.1+incompatible // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/diegoholiveira/jsonlogic/v3 v3.5.3 // indirect github.com/eclipse/paho.mqtt.golang v1.5.0 // indirect - github.com/edgexfoundry/go-mod-bootstrap/v3 v3.2.0-dev.66 // indirect - github.com/edgexfoundry/go-mod-configuration/v3 v3.2.0-dev.19 // indirect - github.com/edgexfoundry/go-mod-messaging/v3 v3.2.0-dev.40 // indirect - github.com/edgexfoundry/go-mod-registry/v3 v3.2.0-dev.18 // indirect - github.com/edgexfoundry/go-mod-secrets/v3 v3.2.0-dev.18 // indirect - github.com/fatih/color v1.16.0 // indirect + github.com/edgexfoundry/go-mod-bootstrap/v4 v4.0.0-dev.2 // indirect + github.com/edgexfoundry/go-mod-configuration/v4 v4.0.0-dev.3 // indirect + github.com/edgexfoundry/go-mod-messaging/v4 v4.0.0-dev.3 // indirect + github.com/edgexfoundry/go-mod-registry/v4 v4.0.0-dev.2 // indirect + github.com/edgexfoundry/go-mod-secrets/v4 v4.0.0-dev.2 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa // indirect github.com/fxamacker/cbor/v2 v2.7.0 // indirect @@ -66,15 +63,8 @@ require ( github.com/gorilla/schema v1.4.1 // indirect github.com/gorilla/securecookie v1.1.2 // indirect github.com/gorilla/websocket v1.5.3 // indirect - github.com/hashicorp/consul/api v1.29.4 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect - github.com/hashicorp/go-cleanhttp v0.5.2 // indirect - github.com/hashicorp/go-hclog v1.5.0 // indirect - github.com/hashicorp/go-immutable-radix v1.3.1 // indirect 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.10.1 // indirect github.com/jackc/pgerrcode v0.0.0-20240316143900-6e2875d9b438 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect @@ -92,9 +82,7 @@ require ( github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect github.com/michaelquigley/pfxlog v0.6.10 // indirect github.com/miekg/pkcs11 v1.1.1 // indirect - github.com/mitchellh/consulstructure v0.0.0-20190329231841-56fdc4d2da54 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect - github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/go-ps v1.0.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect diff --git a/app-service-template/go.sum b/app-service-template/go.sum index 5ebf5f3d0..7e74cf1b0 100644 --- a/app-service-template/go.sum +++ b/app-service-template/go.sum @@ -39,40 +39,24 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= -github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA= -github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df h1:GSoSVRLoBaFpOOds6QyY1L8AX7uoY+Ln3BHc22W40X0= github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df/go.mod h1:hiVxq5OP2bUGBRNS3Z/bt/reCLFNbdcST6gISi1fiOM= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= -github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= -github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= -github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= -github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= @@ -88,18 +72,18 @@ github.com/diegoholiveira/jsonlogic/v3 v3.5.3 h1:CPyZQ3fOgiIDZ1yWzPGUpyht5tYTOnR github.com/diegoholiveira/jsonlogic/v3 v3.5.3/go.mod h1:3nnfWovrlZq2rTpucrJ2KMIS8TMf6IoFneofmeqk/qk= github.com/eclipse/paho.mqtt.golang v1.5.0 h1:EH+bUVJNgttidWFkLLVKaQPGmkTUfQQqjOsyvMGvD6o= github.com/eclipse/paho.mqtt.golang v1.5.0/go.mod h1:du/2qNQVqJf/Sqs4MEL77kR8QTqANF7XU7Fk0aOTAgk= -github.com/edgexfoundry/go-mod-bootstrap/v3 v3.2.0-dev.66 h1:kmBEAhNi4ftrJMXM3IvEbwrRCOWUDuUOKTVAOgHnoPw= -github.com/edgexfoundry/go-mod-bootstrap/v3 v3.2.0-dev.66/go.mod h1:3IXVpc5Qez5nwFJ8IkMyJMba8Iavj620E0XB42BQzfQ= -github.com/edgexfoundry/go-mod-configuration/v3 v3.2.0-dev.19 h1:274NZdVBkJBuQP6yT3tVrb7psTFuIPogX/DLQqv7OCQ= -github.com/edgexfoundry/go-mod-configuration/v3 v3.2.0-dev.19/go.mod h1:BG6hCDxXizpgMdNEljwNfLWSsd4Op7GAHd3Pis1dVv8= -github.com/edgexfoundry/go-mod-core-contracts/v3 v3.2.0-dev.53 h1:aHnYwqpg0LcnMrgNQlkRQjzHAS/IML/9GI368OmNCz4= -github.com/edgexfoundry/go-mod-core-contracts/v3 v3.2.0-dev.53/go.mod h1:MLk37/79M26+bZr3IptNZuYmQBEVbXwzDp1VHQkFhIk= -github.com/edgexfoundry/go-mod-messaging/v3 v3.2.0-dev.40 h1:YyB21HEapV5pENG01vFlpjPI6UkmKpJuaWFfgGFVUsY= -github.com/edgexfoundry/go-mod-messaging/v3 v3.2.0-dev.40/go.mod h1:8NpZ6/eAsiyZHgn/s3DRIpcOjUrve+ZONIgvcDvA3Yg= -github.com/edgexfoundry/go-mod-registry/v3 v3.2.0-dev.18 h1:AzILZ/xcEmSYVhIwSF4zkWpXyFoBA733E/j8ttzlNnI= -github.com/edgexfoundry/go-mod-registry/v3 v3.2.0-dev.18/go.mod h1:TBgZZMF8FAJwxUl3AJgHQaT0S5pwKJKKDP3d638ttrc= -github.com/edgexfoundry/go-mod-secrets/v3 v3.2.0-dev.18 h1:UHyNs7pAdFqURAVL/BWd5riiZczVRdyb7r76dUGxqUU= -github.com/edgexfoundry/go-mod-secrets/v3 v3.2.0-dev.18/go.mod h1:2q9qMnQD4MCAZHgXyB8ltpwuct554HOiPrbRydyXyWQ= +github.com/edgexfoundry/go-mod-bootstrap/v4 v4.0.0-dev.2 h1:T5iCk8PqEdrzgnz6G9xt20GCKxPukZONj2C4ernS7ro= +github.com/edgexfoundry/go-mod-bootstrap/v4 v4.0.0-dev.2/go.mod h1:54WyXiygNbIfITqLVGXU8nOatZh7pMAyO3NQXOuPr5s= +github.com/edgexfoundry/go-mod-configuration/v4 v4.0.0-dev.3 h1:3SdjghkEqos8AySKmz+ehjmI1HP/EmnRaFwNTf0rbyc= +github.com/edgexfoundry/go-mod-configuration/v4 v4.0.0-dev.3/go.mod h1:s/pjxzTfqbsH1s4KyvefhOYmVNc9RvK6sI4x4SGI8Tk= +github.com/edgexfoundry/go-mod-core-contracts/v4 v4.0.0-dev.2 h1:BEJKSvyW+dMTW/yzEKWjs0tGUZnMkFPYX4eypyoG0IY= +github.com/edgexfoundry/go-mod-core-contracts/v4 v4.0.0-dev.2/go.mod h1:I3EG+Tg/gcVSUJ+IJDuvVKFISnRu8oQtMXqltE1rzT8= +github.com/edgexfoundry/go-mod-messaging/v4 v4.0.0-dev.3 h1:FRpec371q4CnRBol0E4utB0BHZLVu146JtCAhau9ujQ= +github.com/edgexfoundry/go-mod-messaging/v4 v4.0.0-dev.3/go.mod h1:eAmCHilZWXL0skB9Frnm2kZTeY81sF6xKOmePoWKTNE= +github.com/edgexfoundry/go-mod-registry/v4 v4.0.0-dev.2 h1:iHu8JPpmrEOrIZdv0iYW69FlMmkyal/FpbXtC3pHt2c= +github.com/edgexfoundry/go-mod-registry/v4 v4.0.0-dev.2/go.mod h1:0qsKMZkTP3jE0GisaNcMjn6euhAIVEFPy4WXbjgzgD0= +github.com/edgexfoundry/go-mod-secrets/v4 v4.0.0-dev.2 h1:7/LBHTVLEefUgcUwSEa4ThRLgCwM9BCTjagkbAVfAXE= +github.com/edgexfoundry/go-mod-secrets/v4 v4.0.0-dev.2/go.mod h1:U5jvaSj2QQSqosfNPEPuTvSS1vgTkAAeLmjKtfcvxJ0= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -110,10 +94,6 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= -github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= -github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= -github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= @@ -132,12 +112,8 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-jose/go-jose/v4 v4.0.4 h1:VsjPI33J0SB9vQM6PLmNjoHqMQNGPiZ0rHL7Ni7Q6/E= github.com/go-jose/go-jose/v4 v4.0.4/go.mod h1:NKb5HO1EZccyMpiZNbdUw/14tiXNyUJh188dfnMCAfc= -github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= -github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA= github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -179,9 +155,7 @@ github.com/go-redis/redis/v7 v7.3.0 h1:3oHqd0W7f/VLKBxeYTEpqdMUsmMectngjM9OtoRoI github.com/go-redis/redis/v7 v7.3.0/go.mod h1:JDNMw23GTyLNC4GZu9njt15ctBQVn7xjRfnwdHj/Dcg= github.com/go-resty/resty/v2 v2.15.3 h1:bqff+hcqAflpiF591hhJzNdkRsFhlB96CYfBwSFvql8= github.com/go-resty/resty/v2 v2.15.3/go.mod h1:0fHAoK7JoBy/Ch36N8VFeMsK7xQOHhvWaC3iOktwmIU= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= @@ -222,8 +196,6 @@ github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNu github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= -github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= 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= @@ -272,61 +244,29 @@ github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aN github.com/gorilla/websocket v1.5.3/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.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= -github.com/hashicorp/consul/api v1.29.4 h1:P6slzxDLBOxUSj3fWo2o65VuKtbtOXFi7TSSgtXutuE= -github.com/hashicorp/consul/api v1.29.4/go.mod h1:HUlfw+l2Zy68ceJavv2zAyArl2fqhGWnMycyt56sBgg= -github.com/hashicorp/consul/proto-public v0.6.2 h1:+DA/3g/IiKlJZb88NBn0ZgXrxJp2NlvCZdEyl+qxvL0= -github.com/hashicorp/consul/proto-public v0.6.2/go.mod h1:cXXbOg74KBNGajC+o8RlA502Esf0R9prcoJgiOX/2Tg= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/consul/sdk v0.16.1 h1:V8TxTnImoPD5cj0U9Spl0TUxcytjcbbJeADFF07KdHg= -github.com/hashicorp/consul/sdk v0.16.1/go.mod h1:fSXvwxB2hmh1FMZCNl6PwX0Q/1wdWtHJcZ7Ea5tns0s= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= -github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= -github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c= -github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= -github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= 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= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= -github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= -github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc= -github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A= github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= -github.com/hashicorp/go-uuid v1.0.3/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/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/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/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= -github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -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.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -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/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= @@ -345,22 +285,17 @@ github.com/jeremija/gosubmit v0.2.7 h1:At0OhGCFGPXyjPYAsCchoBUhE099pcBXmsb4iZqRO github.com/jeremija/gosubmit v0.2.7/go.mod h1:Ui+HS073lCFREXBbdfrJzMB57OI/bdxTiLtrDHHhFPI= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kataras/go-events v0.0.3 h1:o5YK53uURXtrlg7qE/vovxd/yKOJcLuFtPQbf1rYMC4= github.com/kataras/go-events v0.0.3/go.mod h1:bFBgtzwwzrag7kQmGuU1ZaVxhK2qseYPQomXoVEMsj4= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4= github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= @@ -381,43 +316,26 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= -github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= -github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI= github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/michaelquigley/pfxlog v0.6.10 h1:IbC/H3MmSDcPlQHF1UZPQU13Dkrs0+ycWRyQd2ihnjw= github.com/michaelquigley/pfxlog v0.6.10/go.mod h1:gEiNTfKEX6cJHSwRpOuqBpc8oYrlhMiDK/xMk/gV7D0= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= -github.com/miekg/dns v1.1.41 h1:WMszZWJG0XmzbK9FEmzH2TVcqYzFesusSIB41b8KHxY= -github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= github.com/miekg/pkcs11 v1.1.1 h1:Ugu9pdy6vAYku5DEpVWVFPYnzV+bxB+iRdbuFSu7TvU= github.com/miekg/pkcs11 v1.1.1/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= -github.com/mitchellh/consulstructure v0.0.0-20190329231841-56fdc4d2da54 h1:DcITQwl3ymmg7i1XfwpZFs/TPv2PuTwxE8bnuKVtKlk= -github.com/mitchellh/consulstructure v0.0.0-20190329231841-56fdc4d2da54/go.mod h1:dIfpPVUR+ZfkzkDcKnn+oPW1jKeXe4WlNWc7rIXOVxM= github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= -github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc= github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= @@ -431,14 +349,12 @@ github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/muhlemmer/gu v0.3.1 h1:7EAqmFrW7n3hETvuAdmFmn4hS8W+z3LgKtrnow+YzNM= github.com/muhlemmer/gu v0.3.1/go.mod h1:YHtHR+gxM+bKEIIs7Hmi9sPT3ZDUvTN/i88wQpZkrdM= github.com/muhlemmer/httpforwarded v0.1.0 h1:x4DLrzXdliq8mprgUMR0olDvHGkou5BJsK/vWUetyzY= github.com/muhlemmer/httpforwarded v0.1.0/go.mod h1:yo9czKedo2pdZhoXe+yDkGVbU0TJ0q9oQ90BVoDEtw0= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nats-io/nats.go v1.37.0 h1:07rauXbVnnJvv1gfIyghFEo6lUcYRY0WXc3x7x0vUxE= github.com/nats-io/nats.go v1.37.0/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8= github.com/nats-io/nkeys v0.4.7 h1:RwNJbbIdYCoClSDNY7QVKZlyb/wfT6ugvFCiKy6vDvI= @@ -486,10 +402,7 @@ github.com/orcaman/concurrent-map/v2 v2.0.1/go.mod h1:9Eq3TG2oBe5FirmYWQfYO5iH1q github.com/parallaxsecond/parsec-client-go v0.0.0-20221025095442-f0a77d263cf9 h1:mOvehYivJ4Aqu2CPe3D3lv8jhqOI9/1o0THxJHBE0qw= github.com/parallaxsecond/parsec-client-go v0.0.0-20221025095442-f0a77d263cf9/go.mod h1:gLH27qo/dvMhLTVVyMELpe3Tut7sOfkiDg7ZpeqKwsw= 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/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -498,21 +411,9 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= @@ -523,7 +424,6 @@ github.com/rs/cors v1.11.0 h1:0B9GE/r9Bc2UxRMMtymBkHTenPkHDv0CW4Y98GBY+po= github.com/rs/cors v1.11.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI= github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk= @@ -532,8 +432,6 @@ github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= @@ -552,7 +450,6 @@ github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH github.com/spiffe/go-spiffe/v2 v2.4.0 h1:j/FynG7hi2azrBG5cvjRcnQ4sux/VNj8FAVc99Fl66c= github.com/spiffe/go-spiffe/v2 v2.4.0/go.mod h1:m5qJ1hGzjxjtrkGHZupoXHo/FDWwCB1MdSyBzfHugx0= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= @@ -561,7 +458,6 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= @@ -569,7 +465,6 @@ github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFA github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk= github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= -github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= @@ -613,13 +508,11 @@ go.opentelemetry.io/otel/trace v1.29.0/go.mod h1:eHl3w0sp3paPkYstJOmAimxhiFXPg+M go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= @@ -668,7 +561,6 @@ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -677,7 +569,6 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -706,7 +597,6 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= @@ -741,15 +631,12 @@ golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -757,8 +644,6 @@ golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -767,7 +652,6 @@ golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -789,7 +673,6 @@ golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -797,13 +680,9 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/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-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/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-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -823,7 +702,6 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= @@ -847,7 +725,6 @@ golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -999,7 +876,6 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -1017,7 +893,6 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= diff --git a/app-service-template/main.go b/app-service-template/main.go index 3033bd276..953bee155 100644 --- a/app-service-template/main.go +++ b/app-service-template/main.go @@ -27,10 +27,10 @@ import ( "app-new-service/config" "app-new-service/functions" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/transforms" - "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/transforms" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" ) const ( @@ -92,7 +92,7 @@ func (app *myApp) CreateAndRunAppService(serviceKey string, newServiceFactory fu } // Custom configuration can be 'writable' or a section of the configuration can be 'writable' when using - // the Configuration Provider, aka Consul. + // the Configuration Provider, aka keeper. // For more details see https://docs.edgexfoundry.org/latest/microservices/application/GeneralAppServiceConfig/#writable-custom-configuration // TODO: Remove if not using writable custom configuration if err := app.service.ListenForCustomConfigChanges(&app.serviceConfig.AppCustom, "AppCustom", app.ProcessConfigUpdates); err != nil { @@ -149,7 +149,7 @@ func (app *myApp) CreateAndRunAppService(serviceKey string, newServiceFactory fu app.appCtx = app.service.AppContext() // TODO: Add any custom routes your service may have for its REST API - if err := app.service.AddCustomRoute("/api/v3/hello", true, app.helloHandler, http.MethodGet); err != nil { + if err := app.service.AddCustomRoute("/api/v4/hello", true, app.helloHandler, http.MethodGet); err != nil { app.lc.Errorf("AddCustomRoute returned error: %s", err.Error()) return -1 } diff --git a/app-service-template/main_test.go b/app-service-template/main_test.go index c3bb8eae3..7c90d7bc5 100644 --- a/app-service-template/main_test.go +++ b/app-service-template/main_test.go @@ -22,13 +22,13 @@ import ( "fmt" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces/mocks" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces/mocks" ) // This is an example of how to test the code that would typically be in the main() function use mocks diff --git a/go.mod b/go.mod index 11b8f06c0..3c85d100d 100644 --- a/go.mod +++ b/go.mod @@ -1,14 +1,14 @@ -module github.com/edgexfoundry/app-functions-sdk-go/v3 +module github.com/edgexfoundry/app-functions-sdk-go/v4 go 1.23 require ( github.com/diegoholiveira/jsonlogic/v3 v3.5.3 github.com/eclipse/paho.mqtt.golang v1.5.0 - github.com/edgexfoundry/go-mod-bootstrap/v3 v3.2.0-dev.66 - github.com/edgexfoundry/go-mod-core-contracts/v3 v3.2.0-dev.53 - github.com/edgexfoundry/go-mod-messaging/v3 v3.2.0-dev.40 - github.com/edgexfoundry/go-mod-registry/v3 v3.2.0-dev.18 + github.com/edgexfoundry/go-mod-bootstrap/v4 v4.0.0-dev.2 + github.com/edgexfoundry/go-mod-core-contracts/v4 v4.0.0-dev.2 + github.com/edgexfoundry/go-mod-messaging/v4 v4.0.0-dev.3 + github.com/edgexfoundry/go-mod-registry/v4 v4.0.0-dev.2 github.com/fxamacker/cbor/v2 v2.7.0 github.com/gomodule/redigo v1.8.9 github.com/google/uuid v1.6.0 @@ -23,15 +23,12 @@ require ( require ( github.com/Microsoft/go-winio v0.6.2 // indirect - github.com/armon/go-metrics v0.4.1 // indirect github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df // indirect - github.com/cenkalti/backoff v2.2.1+incompatible // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/edgexfoundry/go-mod-configuration/v3 v3.2.0-dev.19 // indirect - github.com/edgexfoundry/go-mod-secrets/v3 v3.2.0-dev.18 // indirect - github.com/fatih/color v1.16.0 // indirect + github.com/edgexfoundry/go-mod-configuration/v4 v4.0.0-dev.3 // indirect + github.com/edgexfoundry/go-mod-secrets/v4 v4.0.0-dev.2 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa // indirect github.com/gabriel-vasile/mimetype v1.4.3 // indirect @@ -63,14 +60,7 @@ require ( github.com/gorilla/schema v1.4.1 // indirect github.com/gorilla/securecookie v1.1.2 // indirect github.com/gorilla/websocket v1.5.3 // indirect - github.com/hashicorp/consul/api v1.29.4 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect - github.com/hashicorp/go-cleanhttp v0.5.2 // indirect - github.com/hashicorp/go-hclog v1.5.0 // indirect - github.com/hashicorp/go-immutable-radix v1.3.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.10.1 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect github.com/jackc/puddle/v2 v2.2.2 // indirect @@ -86,9 +76,7 @@ require ( github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect github.com/michaelquigley/pfxlog v0.6.10 // indirect github.com/miekg/pkcs11 v1.1.1 // indirect - github.com/mitchellh/consulstructure v0.0.0-20190329231841-56fdc4d2da54 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect - github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/go-ps v1.0.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect diff --git a/go.sum b/go.sum index c753d8409..7b019dc69 100644 --- a/go.sum +++ b/go.sum @@ -39,40 +39,24 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= -github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA= -github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df h1:GSoSVRLoBaFpOOds6QyY1L8AX7uoY+Ln3BHc22W40X0= github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df/go.mod h1:hiVxq5OP2bUGBRNS3Z/bt/reCLFNbdcST6gISi1fiOM= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= -github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= -github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= -github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= -github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= @@ -88,18 +72,18 @@ github.com/diegoholiveira/jsonlogic/v3 v3.5.3 h1:CPyZQ3fOgiIDZ1yWzPGUpyht5tYTOnR github.com/diegoholiveira/jsonlogic/v3 v3.5.3/go.mod h1:3nnfWovrlZq2rTpucrJ2KMIS8TMf6IoFneofmeqk/qk= github.com/eclipse/paho.mqtt.golang v1.5.0 h1:EH+bUVJNgttidWFkLLVKaQPGmkTUfQQqjOsyvMGvD6o= github.com/eclipse/paho.mqtt.golang v1.5.0/go.mod h1:du/2qNQVqJf/Sqs4MEL77kR8QTqANF7XU7Fk0aOTAgk= -github.com/edgexfoundry/go-mod-bootstrap/v3 v3.2.0-dev.66 h1:kmBEAhNi4ftrJMXM3IvEbwrRCOWUDuUOKTVAOgHnoPw= -github.com/edgexfoundry/go-mod-bootstrap/v3 v3.2.0-dev.66/go.mod h1:3IXVpc5Qez5nwFJ8IkMyJMba8Iavj620E0XB42BQzfQ= -github.com/edgexfoundry/go-mod-configuration/v3 v3.2.0-dev.19 h1:274NZdVBkJBuQP6yT3tVrb7psTFuIPogX/DLQqv7OCQ= -github.com/edgexfoundry/go-mod-configuration/v3 v3.2.0-dev.19/go.mod h1:BG6hCDxXizpgMdNEljwNfLWSsd4Op7GAHd3Pis1dVv8= -github.com/edgexfoundry/go-mod-core-contracts/v3 v3.2.0-dev.53 h1:aHnYwqpg0LcnMrgNQlkRQjzHAS/IML/9GI368OmNCz4= -github.com/edgexfoundry/go-mod-core-contracts/v3 v3.2.0-dev.53/go.mod h1:MLk37/79M26+bZr3IptNZuYmQBEVbXwzDp1VHQkFhIk= -github.com/edgexfoundry/go-mod-messaging/v3 v3.2.0-dev.40 h1:YyB21HEapV5pENG01vFlpjPI6UkmKpJuaWFfgGFVUsY= -github.com/edgexfoundry/go-mod-messaging/v3 v3.2.0-dev.40/go.mod h1:8NpZ6/eAsiyZHgn/s3DRIpcOjUrve+ZONIgvcDvA3Yg= -github.com/edgexfoundry/go-mod-registry/v3 v3.2.0-dev.18 h1:AzILZ/xcEmSYVhIwSF4zkWpXyFoBA733E/j8ttzlNnI= -github.com/edgexfoundry/go-mod-registry/v3 v3.2.0-dev.18/go.mod h1:TBgZZMF8FAJwxUl3AJgHQaT0S5pwKJKKDP3d638ttrc= -github.com/edgexfoundry/go-mod-secrets/v3 v3.2.0-dev.18 h1:UHyNs7pAdFqURAVL/BWd5riiZczVRdyb7r76dUGxqUU= -github.com/edgexfoundry/go-mod-secrets/v3 v3.2.0-dev.18/go.mod h1:2q9qMnQD4MCAZHgXyB8ltpwuct554HOiPrbRydyXyWQ= +github.com/edgexfoundry/go-mod-bootstrap/v4 v4.0.0-dev.2 h1:T5iCk8PqEdrzgnz6G9xt20GCKxPukZONj2C4ernS7ro= +github.com/edgexfoundry/go-mod-bootstrap/v4 v4.0.0-dev.2/go.mod h1:54WyXiygNbIfITqLVGXU8nOatZh7pMAyO3NQXOuPr5s= +github.com/edgexfoundry/go-mod-configuration/v4 v4.0.0-dev.3 h1:3SdjghkEqos8AySKmz+ehjmI1HP/EmnRaFwNTf0rbyc= +github.com/edgexfoundry/go-mod-configuration/v4 v4.0.0-dev.3/go.mod h1:s/pjxzTfqbsH1s4KyvefhOYmVNc9RvK6sI4x4SGI8Tk= +github.com/edgexfoundry/go-mod-core-contracts/v4 v4.0.0-dev.2 h1:BEJKSvyW+dMTW/yzEKWjs0tGUZnMkFPYX4eypyoG0IY= +github.com/edgexfoundry/go-mod-core-contracts/v4 v4.0.0-dev.2/go.mod h1:I3EG+Tg/gcVSUJ+IJDuvVKFISnRu8oQtMXqltE1rzT8= +github.com/edgexfoundry/go-mod-messaging/v4 v4.0.0-dev.3 h1:FRpec371q4CnRBol0E4utB0BHZLVu146JtCAhau9ujQ= +github.com/edgexfoundry/go-mod-messaging/v4 v4.0.0-dev.3/go.mod h1:eAmCHilZWXL0skB9Frnm2kZTeY81sF6xKOmePoWKTNE= +github.com/edgexfoundry/go-mod-registry/v4 v4.0.0-dev.2 h1:iHu8JPpmrEOrIZdv0iYW69FlMmkyal/FpbXtC3pHt2c= +github.com/edgexfoundry/go-mod-registry/v4 v4.0.0-dev.2/go.mod h1:0qsKMZkTP3jE0GisaNcMjn6euhAIVEFPy4WXbjgzgD0= +github.com/edgexfoundry/go-mod-secrets/v4 v4.0.0-dev.2 h1:7/LBHTVLEefUgcUwSEa4ThRLgCwM9BCTjagkbAVfAXE= +github.com/edgexfoundry/go-mod-secrets/v4 v4.0.0-dev.2/go.mod h1:U5jvaSj2QQSqosfNPEPuTvSS1vgTkAAeLmjKtfcvxJ0= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -110,10 +94,6 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= -github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= -github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= -github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= @@ -132,12 +112,8 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-jose/go-jose/v4 v4.0.4 h1:VsjPI33J0SB9vQM6PLmNjoHqMQNGPiZ0rHL7Ni7Q6/E= github.com/go-jose/go-jose/v4 v4.0.4/go.mod h1:NKb5HO1EZccyMpiZNbdUw/14tiXNyUJh188dfnMCAfc= -github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= -github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA= github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -179,9 +155,7 @@ github.com/go-redis/redis/v7 v7.3.0 h1:3oHqd0W7f/VLKBxeYTEpqdMUsmMectngjM9OtoRoI github.com/go-redis/redis/v7 v7.3.0/go.mod h1:JDNMw23GTyLNC4GZu9njt15ctBQVn7xjRfnwdHj/Dcg= github.com/go-resty/resty/v2 v2.15.3 h1:bqff+hcqAflpiF591hhJzNdkRsFhlB96CYfBwSFvql8= github.com/go-resty/resty/v2 v2.15.3/go.mod h1:0fHAoK7JoBy/Ch36N8VFeMsK7xQOHhvWaC3iOktwmIU= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= @@ -222,8 +196,6 @@ github.com/gomodule/redigo v1.8.9 h1:Sl3u+2BI/kk+VEatbj0scLdrFhjPmbxOc1myhDP41ws github.com/gomodule/redigo v1.8.9/go.mod h1:7ArFNvsTjH8GMMzB4uy1snslv2BwmginuMs06a1uzZE= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= -github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= 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= @@ -272,61 +244,29 @@ github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aN github.com/gorilla/websocket v1.5.3/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.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= -github.com/hashicorp/consul/api v1.29.4 h1:P6slzxDLBOxUSj3fWo2o65VuKtbtOXFi7TSSgtXutuE= -github.com/hashicorp/consul/api v1.29.4/go.mod h1:HUlfw+l2Zy68ceJavv2zAyArl2fqhGWnMycyt56sBgg= -github.com/hashicorp/consul/proto-public v0.6.2 h1:+DA/3g/IiKlJZb88NBn0ZgXrxJp2NlvCZdEyl+qxvL0= -github.com/hashicorp/consul/proto-public v0.6.2/go.mod h1:cXXbOg74KBNGajC+o8RlA502Esf0R9prcoJgiOX/2Tg= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/consul/sdk v0.16.1 h1:V8TxTnImoPD5cj0U9Spl0TUxcytjcbbJeADFF07KdHg= -github.com/hashicorp/consul/sdk v0.16.1/go.mod h1:fSXvwxB2hmh1FMZCNl6PwX0Q/1wdWtHJcZ7Ea5tns0s= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= -github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= -github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c= -github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= -github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= 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= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= -github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= -github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc= -github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A= github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= -github.com/hashicorp/go-uuid v1.0.3/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/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/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/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= -github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -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.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -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/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= @@ -345,22 +285,17 @@ github.com/jeremija/gosubmit v0.2.7 h1:At0OhGCFGPXyjPYAsCchoBUhE099pcBXmsb4iZqRO github.com/jeremija/gosubmit v0.2.7/go.mod h1:Ui+HS073lCFREXBbdfrJzMB57OI/bdxTiLtrDHHhFPI= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kataras/go-events v0.0.3 h1:o5YK53uURXtrlg7qE/vovxd/yKOJcLuFtPQbf1rYMC4= github.com/kataras/go-events v0.0.3/go.mod h1:bFBgtzwwzrag7kQmGuU1ZaVxhK2qseYPQomXoVEMsj4= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4= github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= @@ -381,43 +316,26 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= -github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= -github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI= github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/michaelquigley/pfxlog v0.6.10 h1:IbC/H3MmSDcPlQHF1UZPQU13Dkrs0+ycWRyQd2ihnjw= github.com/michaelquigley/pfxlog v0.6.10/go.mod h1:gEiNTfKEX6cJHSwRpOuqBpc8oYrlhMiDK/xMk/gV7D0= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= -github.com/miekg/dns v1.1.41 h1:WMszZWJG0XmzbK9FEmzH2TVcqYzFesusSIB41b8KHxY= -github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= github.com/miekg/pkcs11 v1.1.1 h1:Ugu9pdy6vAYku5DEpVWVFPYnzV+bxB+iRdbuFSu7TvU= github.com/miekg/pkcs11 v1.1.1/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= -github.com/mitchellh/consulstructure v0.0.0-20190329231841-56fdc4d2da54 h1:DcITQwl3ymmg7i1XfwpZFs/TPv2PuTwxE8bnuKVtKlk= -github.com/mitchellh/consulstructure v0.0.0-20190329231841-56fdc4d2da54/go.mod h1:dIfpPVUR+ZfkzkDcKnn+oPW1jKeXe4WlNWc7rIXOVxM= github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= -github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc= github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= @@ -431,14 +349,12 @@ github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/muhlemmer/gu v0.3.1 h1:7EAqmFrW7n3hETvuAdmFmn4hS8W+z3LgKtrnow+YzNM= github.com/muhlemmer/gu v0.3.1/go.mod h1:YHtHR+gxM+bKEIIs7Hmi9sPT3ZDUvTN/i88wQpZkrdM= github.com/muhlemmer/httpforwarded v0.1.0 h1:x4DLrzXdliq8mprgUMR0olDvHGkou5BJsK/vWUetyzY= github.com/muhlemmer/httpforwarded v0.1.0/go.mod h1:yo9czKedo2pdZhoXe+yDkGVbU0TJ0q9oQ90BVoDEtw0= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nats-io/nats.go v1.37.0 h1:07rauXbVnnJvv1gfIyghFEo6lUcYRY0WXc3x7x0vUxE= github.com/nats-io/nats.go v1.37.0/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8= github.com/nats-io/nkeys v0.4.7 h1:RwNJbbIdYCoClSDNY7QVKZlyb/wfT6ugvFCiKy6vDvI= @@ -486,10 +402,7 @@ github.com/orcaman/concurrent-map/v2 v2.0.1/go.mod h1:9Eq3TG2oBe5FirmYWQfYO5iH1q github.com/parallaxsecond/parsec-client-go v0.0.0-20221025095442-f0a77d263cf9 h1:mOvehYivJ4Aqu2CPe3D3lv8jhqOI9/1o0THxJHBE0qw= github.com/parallaxsecond/parsec-client-go v0.0.0-20221025095442-f0a77d263cf9/go.mod h1:gLH27qo/dvMhLTVVyMELpe3Tut7sOfkiDg7ZpeqKwsw= 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/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -498,21 +411,9 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= @@ -523,7 +424,6 @@ github.com/rs/cors v1.11.0 h1:0B9GE/r9Bc2UxRMMtymBkHTenPkHDv0CW4Y98GBY+po= github.com/rs/cors v1.11.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI= github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk= @@ -532,8 +432,6 @@ github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= @@ -552,7 +450,6 @@ github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH github.com/spiffe/go-spiffe/v2 v2.4.0 h1:j/FynG7hi2azrBG5cvjRcnQ4sux/VNj8FAVc99Fl66c= github.com/spiffe/go-spiffe/v2 v2.4.0/go.mod h1:m5qJ1hGzjxjtrkGHZupoXHo/FDWwCB1MdSyBzfHugx0= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= @@ -561,7 +458,6 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= @@ -569,7 +465,6 @@ github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFA github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk= github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= -github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= @@ -613,13 +508,11 @@ go.opentelemetry.io/otel/trace v1.29.0/go.mod h1:eHl3w0sp3paPkYstJOmAimxhiFXPg+M go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= @@ -668,7 +561,6 @@ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -677,7 +569,6 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -706,7 +597,6 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= @@ -741,15 +631,12 @@ golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -757,8 +644,6 @@ golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -767,7 +652,6 @@ golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -789,7 +673,6 @@ golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -797,13 +680,9 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/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-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/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-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -823,7 +702,6 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= @@ -847,7 +725,6 @@ golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -999,7 +876,6 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -1017,7 +893,6 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= diff --git a/internal/app/backgroundmessage.go b/internal/app/backgroundmessage.go index 8b6ce4677..e1a647b64 100644 --- a/internal/app/backgroundmessage.go +++ b/internal/app/backgroundmessage.go @@ -17,7 +17,7 @@ package app import ( - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) type BackgroundMessage struct { diff --git a/internal/app/backgroundpublisher.go b/internal/app/backgroundpublisher.go index d5d1eebc9..419ded2f1 100644 --- a/internal/app/backgroundpublisher.go +++ b/internal/app/backgroundpublisher.go @@ -19,9 +19,9 @@ package app import ( "fmt" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" ) type backgroundPublisher struct { diff --git a/internal/app/backgroundpublisher_test.go b/internal/app/backgroundpublisher_test.go index 79ac876f6..6f591647f 100644 --- a/internal/app/backgroundpublisher_test.go +++ b/internal/app/backgroundpublisher_test.go @@ -19,7 +19,7 @@ package app import ( "fmt" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/appfunction" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/appfunction" "github.com/google/uuid" "github.com/stretchr/testify/require" "testing" diff --git a/internal/app/configupdates.go b/internal/app/configupdates.go index 5e4b6a8f6..a6de0b5cf 100644 --- a/internal/app/configupdates.go +++ b/internal/app/configupdates.go @@ -21,10 +21,10 @@ import ( "strings" "time" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/bootstrap/container" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/common" - "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/config" - "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/utils" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/bootstrap/container" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/common" + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/config" + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/utils" ) // ConfigUpdateProcessor contains the data need to process configuration updates diff --git a/internal/app/configurable.go b/internal/app/configurable.go index e9c9bff01..30414461b 100644 --- a/internal/app/configurable.go +++ b/internal/app/configurable.go @@ -23,13 +23,13 @@ import ( "strings" "time" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/common" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/transforms" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/util" - bootstrapInterfaces "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" - coreCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/common" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/transforms" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/util" + bootstrapInterfaces "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" + coreCommon "github.com/edgexfoundry/go-mod-core-contracts/v4/common" ) const ( diff --git a/internal/app/configurable_test.go b/internal/app/configurable_test.go index 70ff99acb..c5d8b4675 100644 --- a/internal/app/configurable_test.go +++ b/internal/app/configurable_test.go @@ -21,7 +21,7 @@ import ( "github.com/google/uuid" - "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v4/common" "github.com/stretchr/testify/assert" ) diff --git a/internal/app/service.go b/internal/app/service.go index 2aa185402..dec6d140b 100644 --- a/internal/app/service.go +++ b/internal/app/service.go @@ -30,37 +30,37 @@ import ( "syscall" "time" - "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/utils" + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/utils" - bootstrapHandlers "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/handlers" - "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + bootstrapHandlers "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/handlers" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" "github.com/google/uuid" "github.com/labstack/echo/v4" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/appfunction" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/bootstrap/container" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/bootstrap/handlers" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/common" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/runtime" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/webserver" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/util" - clientInterfaces "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" - coreCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/common" - "github.com/edgexfoundry/go-mod-core-contracts/v3/models" - "github.com/edgexfoundry/go-mod-registry/v3/registry" - - "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap" - "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" - bootstrapInterfaces "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/interfaces" - "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/startup" - bootstrapConfig "github.com/edgexfoundry/go-mod-bootstrap/v3/config" - "github.com/edgexfoundry/go-mod-bootstrap/v3/di" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/appfunction" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/bootstrap/container" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/bootstrap/handlers" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/common" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/runtime" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/webserver" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/util" + clientInterfaces "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" + coreCommon "github.com/edgexfoundry/go-mod-core-contracts/v4/common" + "github.com/edgexfoundry/go-mod-core-contracts/v4/models" + "github.com/edgexfoundry/go-mod-registry/v4/registry" + + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap" + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/config" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/flags" + bootstrapInterfaces "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/interfaces" + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/startup" + bootstrapConfig "github.com/edgexfoundry/go-mod-bootstrap/v4/config" + "github.com/edgexfoundry/go-mod-bootstrap/v4/di" ) const ( diff --git a/internal/app/service_test.go b/internal/app/service_test.go index a75ac2dc2..56690021b 100644 --- a/internal/app/service_test.go +++ b/internal/app/service_test.go @@ -25,25 +25,27 @@ import ( "reflect" "testing" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/appfunction" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/bootstrap/container" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/common" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/runtime" - triggerHttp "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/trigger/http" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/trigger/messagebus" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/webserver" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" - builtin "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/transforms" - bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" - bootstrapInterfaces "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/interfaces" - "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/interfaces/mocks" - "github.com/edgexfoundry/go-mod-bootstrap/v3/config" - "github.com/edgexfoundry/go-mod-bootstrap/v3/di" - clients "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/http" - "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" - coreCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/common" - "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" - messageMocks "github.com/edgexfoundry/go-mod-messaging/v3/messaging/mocks" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/appfunction" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/bootstrap/container" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/common" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/runtime" + triggerHttp "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/trigger/http" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/trigger/messagebus" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/webserver" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" + builtin "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/transforms" + + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/container" + bootstrapInterfaces "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/interfaces" + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/interfaces/mocks" + "github.com/edgexfoundry/go-mod-bootstrap/v4/config" + "github.com/edgexfoundry/go-mod-bootstrap/v4/di" + clients "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/http" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" + coreCommon "github.com/edgexfoundry/go-mod-core-contracts/v4/common" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos" + messageMocks "github.com/edgexfoundry/go-mod-messaging/v4/messaging/mocks" + "github.com/google/uuid" "github.com/labstack/echo/v4" "github.com/stretchr/testify/assert" diff --git a/internal/app/storeforward.go b/internal/app/storeforward.go index 533db6d1a..685a4aab1 100644 --- a/internal/app/storeforward.go +++ b/internal/app/storeforward.go @@ -23,17 +23,18 @@ import ( "sync" "time" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/bootstrap/container" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/common" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/store/db" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/store/db/postgres" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/store/db/redis" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" - bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" - "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/environment" - "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/app-functions-sdk-go/v4/internal/bootstrap/container" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/common" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/store/db" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/store/db/postgres" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/store/db/redis" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" + + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/environment" + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/secret" + bootstrapConfig "github.com/edgexfoundry/go-mod-bootstrap/v4/config" + "github.com/edgexfoundry/go-mod-bootstrap/v4/di" ) const baseScriptPath = "./res/db/sql" diff --git a/internal/app/storeforward_test.go b/internal/app/storeforward_test.go index b46566bcd..c9b63d520 100644 --- a/internal/app/storeforward_test.go +++ b/internal/app/storeforward_test.go @@ -19,10 +19,11 @@ import ( "strings" "testing" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/store/db" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/store/db/redis" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" - "github.com/edgexfoundry/go-mod-bootstrap/v3/config" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/store/db" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/store/db/redis" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" + "github.com/edgexfoundry/go-mod-bootstrap/v4/config" + "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/app/triggerfactory.go b/internal/app/triggerfactory.go index c706dcc90..d29ad0d11 100644 --- a/internal/app/triggerfactory.go +++ b/internal/app/triggerfactory.go @@ -22,11 +22,11 @@ import ( "fmt" "strings" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/common" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/trigger/http" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/trigger/messagebus" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/trigger/mqtt" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/common" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/trigger/http" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/trigger/messagebus" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/trigger/mqtt" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" ) const ( diff --git a/internal/app/triggerfactory_test.go b/internal/app/triggerfactory_test.go index 0b1e21ad7..c9651a220 100644 --- a/internal/app/triggerfactory_test.go +++ b/internal/app/triggerfactory_test.go @@ -25,17 +25,17 @@ import ( "sync" "testing" - "github.com/edgexfoundry/go-mod-bootstrap/v3/di" + "github.com/edgexfoundry/go-mod-bootstrap/v4/di" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/bootstrap/container" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/common" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/trigger/http" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/trigger/messagebus" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/trigger/mqtt" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/bootstrap/container" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/common" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/trigger/http" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/trigger/messagebus" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/trigger/mqtt" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" - "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap" - "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" "github.com/google/uuid" "github.com/stretchr/testify/require" ) diff --git a/internal/app/triggermessageprocessor.go b/internal/app/triggermessageprocessor.go index 6e1edb61d..2cb7d95a0 100644 --- a/internal/app/triggermessageprocessor.go +++ b/internal/app/triggermessageprocessor.go @@ -22,18 +22,18 @@ import ( "sync" "time" - "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" - bootstrapInterfaces "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/interfaces" - "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/messaging" - "github.com/edgexfoundry/go-mod-bootstrap/v3/di" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" - - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/appfunction" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/common" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/runtime" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/trigger" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/container" + bootstrapInterfaces "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/interfaces" + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/messaging" + "github.com/edgexfoundry/go-mod-bootstrap/v4/di" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" + + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/appfunction" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/common" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/runtime" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/trigger" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" "github.com/hashicorp/go-multierror" gometrics "github.com/rcrowley/go-metrics" diff --git a/internal/app/triggermessageprocessor_test.go b/internal/app/triggermessageprocessor_test.go index f3fd3ccaf..811ceef20 100644 --- a/internal/app/triggermessageprocessor_test.go +++ b/internal/app/triggermessageprocessor_test.go @@ -21,9 +21,9 @@ import ( "fmt" "testing" - "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/interfaces/mocks" - "github.com/edgexfoundry/go-mod-bootstrap/v3/di" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/interfaces/mocks" + "github.com/edgexfoundry/go-mod-bootstrap/v4/di" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" "github.com/google/uuid" "github.com/hashicorp/go-multierror" gometrics "github.com/rcrowley/go-metrics" @@ -31,10 +31,10 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/appfunction" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/runtime" - triggerMocks "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/trigger/mocks" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/appfunction" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/runtime" + triggerMocks "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/trigger/mocks" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" ) func Test_simpleTriggerServiceBinding_BuildContext(t *testing.T) { diff --git a/internal/appfunction/context.go b/internal/appfunction/context.go index 858b6da2d..d3e2f6c9b 100644 --- a/internal/appfunction/context.go +++ b/internal/appfunction/context.go @@ -25,20 +25,20 @@ import ( "regexp" "strings" - bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" - bootstrapInterfaces "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/interfaces" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/container" + bootstrapInterfaces "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/interfaces" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" "github.com/google/uuid" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/bootstrap/container" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/bootstrap/container" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" - clients "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" + clients "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v4/common" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos" - "github.com/edgexfoundry/go-mod-bootstrap/v3/di" + "github.com/edgexfoundry/go-mod-bootstrap/v4/di" ) const ( diff --git a/internal/appfunction/context_test.go b/internal/appfunction/context_test.go index 37ac19f86..e314cfd7c 100644 --- a/internal/appfunction/context_test.go +++ b/internal/appfunction/context_test.go @@ -26,22 +26,22 @@ import ( "testing" "time" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/bootstrap/container" - 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/config" - - appCommon "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/common" - bootstrapMocks "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/interfaces/mocks" - clients "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/http" - 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/responses" - messageMocks "github.com/edgexfoundry/go-mod-messaging/v3/messaging/mocks" - - "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/interfaces/mocks" - "github.com/edgexfoundry/go-mod-bootstrap/v3/di" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/bootstrap/container" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/interfaces" + "github.com/edgexfoundry/go-mod-bootstrap/v4/config" + + appCommon "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/common" + bootstrapMocks "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/interfaces/mocks" + clients "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/http" + clientMocks "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/interfaces/mocks" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v4/common" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos/responses" + messageMocks "github.com/edgexfoundry/go-mod-messaging/v4/messaging/mocks" + + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/interfaces/mocks" + "github.com/edgexfoundry/go-mod-bootstrap/v4/di" "github.com/google/uuid" "github.com/stretchr/testify/assert" diff --git a/internal/bootstrap/container/config.go b/internal/bootstrap/container/config.go index c36aa2041..750e1295b 100644 --- a/internal/bootstrap/container/config.go +++ b/internal/bootstrap/container/config.go @@ -16,9 +16,9 @@ package container import ( - "github.com/edgexfoundry/go-mod-bootstrap/v3/di" + "github.com/edgexfoundry/go-mod-bootstrap/v4/di" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/common" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/common" ) // ConfigurationName contains the name of data's common.ConfigurationStruct implementation in the DIC. diff --git a/internal/bootstrap/container/storeclient.go b/internal/bootstrap/container/storeclient.go index 4c1d6e292..4b004be56 100644 --- a/internal/bootstrap/container/storeclient.go +++ b/internal/bootstrap/container/storeclient.go @@ -16,9 +16,9 @@ package container import ( - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" - "github.com/edgexfoundry/go-mod-bootstrap/v3/di" + "github.com/edgexfoundry/go-mod-bootstrap/v4/di" ) // StoreClientName contains the name of interfaces.StoreClient implementation in the DIC. diff --git a/internal/bootstrap/handlers/version.go b/internal/bootstrap/handlers/version.go index d85825cd2..d7f23b25c 100644 --- a/internal/bootstrap/handlers/version.go +++ b/internal/bootstrap/handlers/version.go @@ -20,16 +20,16 @@ import ( "strings" "sync" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/bootstrap/container" - - bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" - "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/secret" - "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/startup" - "github.com/edgexfoundry/go-mod-bootstrap/v3/di" - clients "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/http" - "github.com/edgexfoundry/go-mod-core-contracts/v3/common" - commonDtos "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/bootstrap/container" + + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/secret" + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/startup" + "github.com/edgexfoundry/go-mod-bootstrap/v4/di" + clients "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/http" + "github.com/edgexfoundry/go-mod-core-contracts/v4/common" + commonDtos "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos/common" ) const ( diff --git a/internal/bootstrap/handlers/version_test.go b/internal/bootstrap/handlers/version_test.go index 000989230..7f2f80660 100644 --- a/internal/bootstrap/handlers/version_test.go +++ b/internal/bootstrap/handlers/version_test.go @@ -25,17 +25,17 @@ import ( "sync" "testing" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/bootstrap/container" - sdkCommon "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/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/startup" - "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-registry/v3/registry" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/bootstrap/container" + sdkCommon "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/common" + + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/interfaces/mocks" + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/startup" + "github.com/edgexfoundry/go-mod-bootstrap/v4/config" + "github.com/edgexfoundry/go-mod-bootstrap/v4/di" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v4/common" + "github.com/edgexfoundry/go-mod-registry/v4/registry" "github.com/stretchr/testify/assert" ) diff --git a/internal/common/config.go b/internal/common/config.go index 8d58ccfbb..340b2a0f7 100644 --- a/internal/common/config.go +++ b/internal/common/config.go @@ -17,7 +17,7 @@ package common import ( - bootstrapConfig "github.com/edgexfoundry/go-mod-bootstrap/v3/config" + bootstrapConfig "github.com/edgexfoundry/go-mod-bootstrap/v4/config" ) // WritableInfo is used to hold configuration information that is considered "live" or can be changed on the fly without a restart of the service. diff --git a/internal/constant.go b/internal/constant.go index d223f7371..09a38fdff 100644 --- a/internal/constant.go +++ b/internal/constant.go @@ -16,7 +16,7 @@ package internal -import "github.com/edgexfoundry/go-mod-core-contracts/v3/common" +import "github.com/edgexfoundry/go-mod-core-contracts/v4/common" // SDKVersion indicates the version of the SDK - will be overwritten by build var SDKVersion = "0.0.0" diff --git a/internal/runtime/runtime.go b/internal/runtime/runtime.go index bc0772cf6..98a89fbf3 100644 --- a/internal/runtime/runtime.go +++ b/internal/runtime/runtime.go @@ -29,23 +29,23 @@ import ( "strings" "sync" - bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" - bootstrapInterfaces "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" - "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" - edgexErrors "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v3/models" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/container" + bootstrapInterfaces "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/interfaces" + "github.com/edgexfoundry/go-mod-bootstrap/v4/di" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v4/common" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos/requests" + edgexErrors "github.com/edgexfoundry/go-mod-core-contracts/v4/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v4/models" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" "github.com/fxamacker/cbor/v2" gometrics "github.com/rcrowley/go-metrics" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/appfunction" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/appfunction" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" ) const ( diff --git a/internal/runtime/runtime_test.go b/internal/runtime/runtime_test.go index ec54aa86f..73f7b89e8 100644 --- a/internal/runtime/runtime_test.go +++ b/internal/runtime/runtime_test.go @@ -21,18 +21,18 @@ import ( "net/http" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" "github.com/google/uuid" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/appfunction" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/transforms" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/appfunction" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/transforms" - "github.com/edgexfoundry/go-mod-bootstrap/v3/config" - "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" + "github.com/edgexfoundry/go-mod-bootstrap/v4/config" + "github.com/edgexfoundry/go-mod-core-contracts/v4/common" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos/requests" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" "github.com/fxamacker/cbor/v2" "github.com/stretchr/testify/assert" diff --git a/internal/runtime/storeforward.go b/internal/runtime/storeforward.go index b6561eefe..444714f6d 100644 --- a/internal/runtime/storeforward.go +++ b/internal/runtime/storeforward.go @@ -24,14 +24,14 @@ import ( "sync/atomic" "time" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/appfunction" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/bootstrap/container" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" - 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/app-functions-sdk-go/v4/internal" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/appfunction" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/bootstrap/container" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v4/di" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v4/common" gometrics "github.com/rcrowley/go-metrics" ) diff --git a/internal/runtime/storeforward_test.go b/internal/runtime/storeforward_test.go index 5e04b68bd..5524453af 100644 --- a/internal/runtime/storeforward_test.go +++ b/internal/runtime/storeforward_test.go @@ -21,26 +21,26 @@ import ( "os" "testing" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/appfunction" - mocks2 "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/interfaces/mocks" - loggerMocks "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger/mocks" - common2 "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/appfunction" + mocks2 "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/interfaces/mocks" + loggerMocks "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger/mocks" + common2 "github.com/edgexfoundry/go-mod-core-contracts/v4/common" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces/mocks" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces/mocks" - 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" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v4/di" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" "github.com/stretchr/testify/require" "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/bootstrap/container" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/common" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/transforms" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/bootstrap/container" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/common" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/transforms" ) var dic *di.Container diff --git a/internal/store/db/models/storedobject.go b/internal/store/db/models/storedobject.go index e92510e51..0290e3921 100644 --- a/internal/store/db/models/storedobject.go +++ b/internal/store/db/models/storedobject.go @@ -17,7 +17,7 @@ package models import ( "encoding/json" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" ) // StoredObject is the atomic and most abstract description of what is collected by the export store system. diff --git a/internal/store/db/models/storedobject_test.go b/internal/store/db/models/storedobject_test.go index 18f110e34..232694b9f 100644 --- a/internal/store/db/models/storedobject_test.go +++ b/internal/store/db/models/storedobject_test.go @@ -16,7 +16,7 @@ package models import ( "bytes" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" "reflect" "testing" ) diff --git a/internal/store/db/postgres/client.go b/internal/store/db/postgres/client.go index 34cbe6c0a..056581419 100644 --- a/internal/store/db/postgres/client.go +++ b/internal/store/db/postgres/client.go @@ -12,10 +12,10 @@ import ( "os" "sync" - bootstrapConfig "github.com/edgexfoundry/go-mod-bootstrap/v3/config" + bootstrapConfig "github.com/edgexfoundry/go-mod-bootstrap/v4/config" - "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" - "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v4/errors" "github.com/jackc/pgx/v5/pgxpool" ) diff --git a/internal/store/db/postgres/client_test.go b/internal/store/db/postgres/client_test.go index 57ae4b435..a4ecd577e 100644 --- a/internal/store/db/postgres/client_test.go +++ b/internal/store/db/postgres/client_test.go @@ -25,10 +25,10 @@ import ( "context" "testing" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/store/db" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/store/db" - bootstrapConfig "github.com/edgexfoundry/go-mod-bootstrap/v3/config" - "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + bootstrapConfig "github.com/edgexfoundry/go-mod-bootstrap/v4/config" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" "github.com/stretchr/testify/require" ) diff --git a/internal/store/db/postgres/store.go b/internal/store/db/postgres/store.go index d3a8912b4..d4dd02e50 100644 --- a/internal/store/db/postgres/store.go +++ b/internal/store/db/postgres/store.go @@ -10,10 +10,10 @@ import ( "encoding/json" "fmt" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/store/db/models" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/store/db/models" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v4/errors" "github.com/jackc/pgx/v5" ) diff --git a/internal/store/db/postgres/store_test.go b/internal/store/db/postgres/store_test.go index 38872d537..6ce6e36a9 100644 --- a/internal/store/db/postgres/store_test.go +++ b/internal/store/db/postgres/store_test.go @@ -25,8 +25,8 @@ import ( "context" "testing" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" "github.com/google/uuid" "github.com/stretchr/testify/require" diff --git a/internal/store/db/postgres/utils.go b/internal/store/db/postgres/utils.go index b537e8820..d9f689c03 100644 --- a/internal/store/db/postgres/utils.go +++ b/internal/store/db/postgres/utils.go @@ -15,7 +15,7 @@ import ( "sort" "strings" - "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v4/errors" "github.com/jackc/pgerrcode" "github.com/jackc/pgx/v5" diff --git a/internal/store/db/redis/store.go b/internal/store/db/redis/store.go index 9858130b5..1354cbbbc 100644 --- a/internal/store/db/redis/store.go +++ b/internal/store/db/redis/store.go @@ -22,10 +22,10 @@ import ( "sync" "time" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/store/db/models" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/store/db/models" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" - bootstrapConfig "github.com/edgexfoundry/go-mod-bootstrap/v3/config" + bootstrapConfig "github.com/edgexfoundry/go-mod-bootstrap/v4/config" "github.com/gomodule/redigo/redis" ) diff --git a/internal/store/db/redis/store_test.go b/internal/store/db/redis/store_test.go index b6cee28f6..c028ee0fb 100644 --- a/internal/store/db/redis/store_test.go +++ b/internal/store/db/redis/store_test.go @@ -22,13 +22,13 @@ package redis import ( - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" "testing" - bootstrapConfig "github.com/edgexfoundry/go-mod-bootstrap/v3/config" + bootstrapConfig "github.com/edgexfoundry/go-mod-bootstrap/v4/config" "github.com/stretchr/testify/require" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/store/db" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/store/db" "github.com/google/uuid" ) diff --git a/internal/trigger/http/rest.go b/internal/trigger/http/rest.go index 922c1b7d9..33f31341a 100644 --- a/internal/trigger/http/rest.go +++ b/internal/trigger/http/rest.go @@ -25,18 +25,18 @@ import ( "net/http" "sync" - "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/appfunction" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/trigger" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/appfunction" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/trigger" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal" - "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap" - "github.com/edgexfoundry/go-mod-core-contracts/v3/common" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap" + "github.com/edgexfoundry/go-mod-core-contracts/v4/common" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) type TriggerRouteManager interface { diff --git a/internal/trigger/http/rest_test.go b/internal/trigger/http/rest_test.go index 4b5a011e4..0c5cc0cae 100644 --- a/internal/trigger/http/rest_test.go +++ b/internal/trigger/http/rest_test.go @@ -25,21 +25,21 @@ import ( "net/http" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v4/common" "github.com/google/uuid" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/appfunction" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/runtime" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/trigger/http/mocks" - triggerMocks "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/trigger/mocks" - interfaceMocks "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces/mocks" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/appfunction" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/runtime" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/trigger/http/mocks" + triggerMocks "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/trigger/mocks" + interfaceMocks "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces/mocks" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" "github.com/stretchr/testify/assert" ) diff --git a/internal/trigger/messagebus/messaging.go b/internal/trigger/messagebus/messaging.go index 52e2a71fc..ca0b1565c 100644 --- a/internal/trigger/messagebus/messaging.go +++ b/internal/trigger/messagebus/messaging.go @@ -24,18 +24,18 @@ import ( "strings" "sync" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal" - "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap" - "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-messaging/v3/messaging" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" - - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/trigger" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/util" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal" + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap" + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v4/di" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v4/common" + "github.com/edgexfoundry/go-mod-messaging/v4/messaging" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" + + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/trigger" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/util" ) // Trigger implements Trigger to support MessageBusData diff --git a/internal/trigger/messagebus/messaging_test.go b/internal/trigger/messagebus/messaging_test.go index e6d6ed375..cdec827ad 100644 --- a/internal/trigger/messagebus/messaging_test.go +++ b/internal/trigger/messagebus/messaging_test.go @@ -24,21 +24,21 @@ import ( "sync" "testing" - bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" - "github.com/edgexfoundry/go-mod-bootstrap/v3/di" - "github.com/edgexfoundry/go-mod-messaging/v3/messaging/mocks" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v4/di" + "github.com/edgexfoundry/go-mod-messaging/v4/messaging/mocks" - interfaceMocks "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces/mocks" + interfaceMocks "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces/mocks" "github.com/stretchr/testify/mock" - sdkCommon "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/common" - triggerMocks "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/trigger/mocks" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + sdkCommon "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/common" + triggerMocks "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/trigger/mocks" + "github.com/edgexfoundry/app-functions-sdk-go/v4/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-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v4/common" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/trigger/messageprocessor.go b/internal/trigger/messageprocessor.go index 6efea5176..35f1f72c1 100644 --- a/internal/trigger/messageprocessor.go +++ b/internal/trigger/messageprocessor.go @@ -18,9 +18,9 @@ package trigger import ( - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" ) type MessageProcessor interface { diff --git a/internal/trigger/mocks/MessageProcessor.go b/internal/trigger/mocks/MessageProcessor.go index fd5cf8690..9a41731a1 100644 --- a/internal/trigger/mocks/MessageProcessor.go +++ b/internal/trigger/mocks/MessageProcessor.go @@ -3,10 +3,10 @@ package mocks import ( - interfaces "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + interfaces "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" mock "github.com/stretchr/testify/mock" - types "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + types "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) // MessageProcessor is an autogenerated mock type for the MessageProcessor type diff --git a/internal/trigger/mocks/ServiceBinding.go b/internal/trigger/mocks/ServiceBinding.go index a17eaad2c..d5901b58b 100644 --- a/internal/trigger/mocks/ServiceBinding.go +++ b/internal/trigger/mocks/ServiceBinding.go @@ -3,20 +3,20 @@ package mocks import ( - appfunction "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/appfunction" - common "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/common" + appfunction "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/appfunction" + common "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/common" - interfaces "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + interfaces "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" - logger "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + logger "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" - messaging "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/messaging" + messaging "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/messaging" mock "github.com/stretchr/testify/mock" - runtime "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/runtime" + runtime "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/runtime" - types "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + types "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) // ServiceBinding is an autogenerated mock type for the ServiceBinding type diff --git a/internal/trigger/mqtt/mqtt.go b/internal/trigger/mqtt/mqtt.go index bed7f48ff..016e14662 100644 --- a/internal/trigger/mqtt/mqtt.go +++ b/internal/trigger/mqtt/mqtt.go @@ -26,18 +26,18 @@ import ( "sync" "time" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/common" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/trigger" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/secure" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/util" - - "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap" - "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/messaging" - "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/startup" - "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" - commonContracts "github.com/edgexfoundry/go-mod-core-contracts/v3/common" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/common" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/trigger" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/secure" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/util" + + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap" + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/messaging" + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/startup" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" + commonContracts "github.com/edgexfoundry/go-mod-core-contracts/v4/common" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" pahoMqtt "github.com/eclipse/paho.mqtt.golang" "github.com/google/uuid" diff --git a/internal/trigger/mqtt/mqtt_test.go b/internal/trigger/mqtt/mqtt_test.go index 308f0e808..10df84826 100644 --- a/internal/trigger/mqtt/mqtt_test.go +++ b/internal/trigger/mqtt/mqtt_test.go @@ -20,15 +20,15 @@ import ( "fmt" "testing" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/appfunction" - sdkCommon "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/common" - triggerMocks "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/trigger/mocks" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/trigger/mqtt/mocks" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" - interfaceMocks "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/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-messaging/v3/pkg/types" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/appfunction" + sdkCommon "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/common" + triggerMocks "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/trigger/mocks" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/trigger/mqtt/mocks" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" + interfaceMocks "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces/mocks" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v4/common" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/trigger/servicebinding.go b/internal/trigger/servicebinding.go index 387a3a34f..b2a2b7676 100644 --- a/internal/trigger/servicebinding.go +++ b/internal/trigger/servicebinding.go @@ -18,15 +18,15 @@ package trigger import ( - "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/messaging" - "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/messaging" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/appfunction" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/common" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/runtime" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/appfunction" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/common" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/runtime" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" ) type ServiceBinding interface { diff --git a/internal/webserver/server.go b/internal/webserver/server.go index fb28a76fc..8f0837933 100644 --- a/internal/webserver/server.go +++ b/internal/webserver/server.go @@ -24,19 +24,19 @@ import ( "strings" "time" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/bootstrap/container" - sdkCommon "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/common" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" - bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" - "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/controller" - - bscfg "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/config" - bootstrapHandlers "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/handlers" - "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/utils" - "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/zerotrust" - "github.com/edgexfoundry/go-mod-bootstrap/v3/di" - "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/bootstrap/container" + sdkCommon "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/common" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/controller" + + bscfg "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/config" + bootstrapHandlers "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/handlers" + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/utils" + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/zerotrust" + "github.com/edgexfoundry/go-mod-bootstrap/v4/di" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" "github.com/labstack/echo/v4" ) diff --git a/internal/webserver/server_test.go b/internal/webserver/server_test.go index 642d92e6c..61c656bae 100644 --- a/internal/webserver/server_test.go +++ b/internal/webserver/server_test.go @@ -25,16 +25,16 @@ import ( "github.com/google/uuid" "github.com/labstack/echo/v4" - 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" - "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/interfaces/mocks" + "github.com/edgexfoundry/go-mod-bootstrap/v4/di" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/bootstrap/container" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/common" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/bootstrap/container" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/common" ) var dic *di.Container diff --git a/pkg/factory.go b/pkg/factory.go index 6bbfb8342..ef01e00ae 100644 --- a/pkg/factory.go +++ b/pkg/factory.go @@ -19,15 +19,15 @@ package pkg import ( "fmt" - 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/app-functions-sdk-go/v3/internal/app" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/appfunction" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/bootstrap/container" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/common" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v4/di" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" + + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/app" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/appfunction" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/bootstrap/container" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/common" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" ) // NewAppService creates and returns a new ApplicationService with the default TargetType diff --git a/pkg/factory_test.go b/pkg/factory_test.go index 5476b0676..b4eced48c 100644 --- a/pkg/factory_test.go +++ b/pkg/factory_test.go @@ -20,9 +20,9 @@ import ( "os" "testing" - 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" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v4/di" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" "github.com/google/uuid" "github.com/stretchr/testify/assert" ) diff --git a/pkg/interfaces/backgroundmessage.go b/pkg/interfaces/backgroundmessage.go index 9cb4554c7..0b2d1a205 100644 --- a/pkg/interfaces/backgroundmessage.go +++ b/pkg/interfaces/backgroundmessage.go @@ -17,7 +17,7 @@ package interfaces import ( - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) type BackgroundMessage interface { diff --git a/pkg/interfaces/context.go b/pkg/interfaces/context.go index 9749fdb76..bc929f32a 100644 --- a/pkg/interfaces/context.go +++ b/pkg/interfaces/context.go @@ -17,10 +17,10 @@ package interfaces import ( - bootstrapInterfaces "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/interfaces" - "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/dtos" + bootstrapInterfaces "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos" ) const ( diff --git a/pkg/interfaces/mocks/AppFunctionContext.go b/pkg/interfaces/mocks/AppFunctionContext.go index 6d18a64c4..830ab36cf 100644 --- a/pkg/interfaces/mocks/AppFunctionContext.go +++ b/pkg/interfaces/mocks/AppFunctionContext.go @@ -3,14 +3,14 @@ package mocks import ( - bootstrapinterfaces "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/interfaces" - clientsinterfaces "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/interfaces" + bootstrapinterfaces "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/interfaces" + clientsinterfaces "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/interfaces" - dtos "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + dtos "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos" - interfaces "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + interfaces "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" - logger "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + logger "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" mock "github.com/stretchr/testify/mock" ) diff --git a/pkg/interfaces/mocks/ApplicationService.go b/pkg/interfaces/mocks/ApplicationService.go index 1626ca612..f2df418a0 100644 --- a/pkg/interfaces/mocks/ApplicationService.go +++ b/pkg/interfaces/mocks/ApplicationService.go @@ -3,10 +3,10 @@ package mocks import ( - bootstrapinterfaces "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/interfaces" - clientsinterfaces "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/interfaces" + bootstrapinterfaces "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/interfaces" + clientsinterfaces "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/interfaces" - config "github.com/edgexfoundry/go-mod-bootstrap/v3/config" + config "github.com/edgexfoundry/go-mod-bootstrap/v4/config" context "context" @@ -14,13 +14,13 @@ import ( http "net/http" - interfaces "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + interfaces "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" - logger "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + logger "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" mock "github.com/stretchr/testify/mock" - registry "github.com/edgexfoundry/go-mod-registry/v3/registry" + registry "github.com/edgexfoundry/go-mod-registry/v4/registry" time "time" ) diff --git a/pkg/interfaces/mocks/BackgroundPublisher.go b/pkg/interfaces/mocks/BackgroundPublisher.go index 58714a956..b30e39c15 100644 --- a/pkg/interfaces/mocks/BackgroundPublisher.go +++ b/pkg/interfaces/mocks/BackgroundPublisher.go @@ -3,7 +3,7 @@ package mocks import ( - interfaces "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + interfaces "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" mock "github.com/stretchr/testify/mock" ) diff --git a/pkg/interfaces/mocks/StoreClient.go b/pkg/interfaces/mocks/StoreClient.go index b346e763b..4374e31e6 100644 --- a/pkg/interfaces/mocks/StoreClient.go +++ b/pkg/interfaces/mocks/StoreClient.go @@ -3,7 +3,7 @@ package mocks import ( - interfaces "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + interfaces "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" mock "github.com/stretchr/testify/mock" ) diff --git a/pkg/interfaces/mocks/Trigger.go b/pkg/interfaces/mocks/Trigger.go index 9c77f1e09..50e717c4a 100644 --- a/pkg/interfaces/mocks/Trigger.go +++ b/pkg/interfaces/mocks/Trigger.go @@ -5,9 +5,9 @@ package mocks import ( context "context" - bootstrap "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap" + bootstrap "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap" - interfaces "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + interfaces "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" mock "github.com/stretchr/testify/mock" diff --git a/pkg/interfaces/mocks/TriggerContextBuilder.go b/pkg/interfaces/mocks/TriggerContextBuilder.go index be5be3542..060e94f02 100644 --- a/pkg/interfaces/mocks/TriggerContextBuilder.go +++ b/pkg/interfaces/mocks/TriggerContextBuilder.go @@ -3,10 +3,10 @@ package mocks import ( - interfaces "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + interfaces "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" mock "github.com/stretchr/testify/mock" - types "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + types "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) // TriggerContextBuilder is an autogenerated mock type for the TriggerContextBuilder type diff --git a/pkg/interfaces/mocks/TriggerMessageProcessor.go b/pkg/interfaces/mocks/TriggerMessageProcessor.go index b3b53b8a4..a250e9ad0 100644 --- a/pkg/interfaces/mocks/TriggerMessageProcessor.go +++ b/pkg/interfaces/mocks/TriggerMessageProcessor.go @@ -3,10 +3,10 @@ package mocks import ( - interfaces "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + interfaces "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" mock "github.com/stretchr/testify/mock" - types "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + types "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) // TriggerMessageProcessor is an autogenerated mock type for the TriggerMessageProcessor type diff --git a/pkg/interfaces/service.go b/pkg/interfaces/service.go index cf9fb7f04..4e301340b 100644 --- a/pkg/interfaces/service.go +++ b/pkg/interfaces/service.go @@ -22,13 +22,13 @@ import ( "github.com/labstack/echo/v4" - "github.com/edgexfoundry/go-mod-bootstrap/v3/config" + "github.com/edgexfoundry/go-mod-bootstrap/v4/config" gometrics "github.com/rcrowley/go-metrics" - bootstrapInterfaces "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/interfaces" - "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-registry/v3/registry" + bootstrapInterfaces "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" + "github.com/edgexfoundry/go-mod-registry/v4/registry" ) const ( @@ -67,7 +67,7 @@ type FunctionPipeline struct { } // UpdatableConfig interface allows services to have custom configuration populated from configuration stored -// in the Configuration Provider (aka Consul). Services using custom configuration must implement this interface +// in the Configuration Provider (aka keeper). Services using custom configuration must implement this interface // on their custom configuration, even if they do not use Configuration Provider. If they do not use the // Configuration Provider they can have dummy implementation of this interface. // This wraps the actual interface from go-mod-bootstrap so app service code doesn't have to have the additional diff --git a/pkg/interfaces/trigger.go b/pkg/interfaces/trigger.go index 4b9345d6f..2a4737ec3 100644 --- a/pkg/interfaces/trigger.go +++ b/pkg/interfaces/trigger.go @@ -21,9 +21,9 @@ import ( "context" "sync" - "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap" - "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) type TriggerConfig struct { diff --git a/pkg/secure/mqttfactory.go b/pkg/secure/mqttfactory.go index 784d4fd41..e293ffcdf 100644 --- a/pkg/secure/mqttfactory.go +++ b/pkg/secure/mqttfactory.go @@ -22,8 +22,8 @@ import ( "errors" mqtt "github.com/eclipse/paho.mqtt.golang" - "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/messaging" - "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/messaging" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" ) type MqttFactory struct { diff --git a/pkg/secure/mqttfactory_test.go b/pkg/secure/mqttfactory_test.go index b144f0ec4..3fc50cd75 100644 --- a/pkg/secure/mqttfactory_test.go +++ b/pkg/secure/mqttfactory_test.go @@ -25,14 +25,14 @@ import ( mqtt "github.com/eclipse/paho.mqtt.golang" - bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" - "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/messaging" - "github.com/edgexfoundry/go-mod-bootstrap/v3/di" - "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/messaging" + "github.com/edgexfoundry/go-mod-bootstrap/v4/di" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/appfunction" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/appfunction" ) var lc logger.LoggingClient diff --git a/pkg/transforms/aesprotection.go b/pkg/transforms/aesprotection.go index 3cd21bd8f..de28cd8fe 100644 --- a/pkg/transforms/aesprotection.go +++ b/pkg/transforms/aesprotection.go @@ -22,11 +22,11 @@ import ( "encoding/hex" "fmt" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/etm" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/util" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/etm" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/util" - "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v4/common" ) type AESProtection struct { diff --git a/pkg/transforms/aesprotection_test.go b/pkg/transforms/aesprotection_test.go index bceb03a56..cf3f90661 100644 --- a/pkg/transforms/aesprotection_test.go +++ b/pkg/transforms/aesprotection_test.go @@ -22,12 +22,12 @@ import ( "fmt" "testing" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/etm" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces/mocks" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/util" - bootstrapMocks "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/interfaces/mocks" - "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" - "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/etm" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces/mocks" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/util" + bootstrapMocks "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/interfaces/mocks" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v4/common" "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/transforms/batch.go b/pkg/transforms/batch.go index e24a8b9c9..ca45cd00b 100644 --- a/pkg/transforms/batch.go +++ b/pkg/transforms/batch.go @@ -22,11 +22,11 @@ import ( "sync" "time" - "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/common" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/util" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/common" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/util" ) // BatchMode Enum for choosing behavior of Batch. Default is CountAndTime. diff --git a/pkg/transforms/batch_test.go b/pkg/transforms/batch_test.go index 57bdd44a3..0e29bbecb 100644 --- a/pkg/transforms/batch_test.go +++ b/pkg/transforms/batch_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "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/v4/common" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/transforms/compression.go b/pkg/transforms/compression.go index 31edcdd51..840e41194 100644 --- a/pkg/transforms/compression.go +++ b/pkg/transforms/compression.go @@ -25,12 +25,12 @@ import ( "fmt" "sync" - "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/util" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/util" - "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v4/common" ) type Compression struct { diff --git a/pkg/transforms/compression_test.go b/pkg/transforms/compression_test.go index 66899b21e..0b8b272b9 100644 --- a/pkg/transforms/compression_test.go +++ b/pkg/transforms/compression_test.go @@ -22,12 +22,12 @@ import ( "compress/gzip" "compress/zlib" "encoding/base64" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" "io" "sync" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v4/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/transforms/conversion.go b/pkg/transforms/conversion.go index e62c739ec..0235db8b4 100755 --- a/pkg/transforms/conversion.go +++ b/pkg/transforms/conversion.go @@ -20,10 +20,10 @@ import ( "encoding/json" "fmt" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" - "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/v4/common" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos" ) // Conversion houses various built in conversion transforms (XML, JSON, CSV) diff --git a/pkg/transforms/conversion_test.go b/pkg/transforms/conversion_test.go index 17b0ba5ff..01440546a 100644 --- a/pkg/transforms/conversion_test.go +++ b/pkg/transforms/conversion_test.go @@ -19,8 +19,8 @@ package transforms import ( "testing" - "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/v4/common" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/transforms/event.go b/pkg/transforms/event.go index f40bd23de..823e13a04 100644 --- a/pkg/transforms/event.go +++ b/pkg/transforms/event.go @@ -19,12 +19,12 @@ package transforms import ( "fmt" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/util" - "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/util" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos/requests" - "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/v4/common" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos" ) type EventWrapper struct { diff --git a/pkg/transforms/event_test.go b/pkg/transforms/event_test.go index 282f64794..ad5f40a46 100644 --- a/pkg/transforms/event_test.go +++ b/pkg/transforms/event_test.go @@ -20,9 +20,9 @@ import ( "strconv" "testing" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v3/common" - "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v4/common" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos/requests" "github.com/stretchr/testify/require" ) diff --git a/pkg/transforms/filter.go b/pkg/transforms/filter.go index 388ce53fb..d2e1953c8 100755 --- a/pkg/transforms/filter.go +++ b/pkg/transforms/filter.go @@ -20,10 +20,10 @@ import ( "fmt" "regexp" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" - "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/v4/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos" ) // Filter houses various the parameters for which filter transforms filter on diff --git a/pkg/transforms/filter_test.go b/pkg/transforms/filter_test.go index 91cccf4f2..9b2617697 100644 --- a/pkg/transforms/filter_test.go +++ b/pkg/transforms/filter_test.go @@ -19,9 +19,9 @@ package transforms import ( "testing" - "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/v4/common" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos/requests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/transforms/helpers.go b/pkg/transforms/helpers.go index 4216692e2..2759221de 100644 --- a/pkg/transforms/helpers.go +++ b/pkg/transforms/helpers.go @@ -17,7 +17,7 @@ package transforms import ( - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" ) func registerMetric(ctx interfaces.AppFunctionContext, fullNameFunc func() string, getMetric func() any, tags map[string]string) { diff --git a/pkg/transforms/helpers_test.go b/pkg/transforms/helpers_test.go index 7f552572f..e2a2a0f24 100644 --- a/pkg/transforms/helpers_test.go +++ b/pkg/transforms/helpers_test.go @@ -20,9 +20,9 @@ import ( "errors" "testing" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces/mocks" - mocks2 "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/interfaces/mocks" - loggerMocks "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger/mocks" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces/mocks" + mocks2 "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/interfaces/mocks" + loggerMocks "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger/mocks" gometrics "github.com/rcrowley/go-metrics" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/pkg/transforms/http.go b/pkg/transforms/http.go index 661b87246..02bc8fec4 100644 --- a/pkg/transforms/http.go +++ b/pkg/transforms/http.go @@ -23,12 +23,12 @@ import ( "net/http" "net/url" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/util" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/util" gometrics "github.com/rcrowley/go-metrics" - "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v4/common" ) // HTTPSender ... diff --git a/pkg/transforms/http_test.go b/pkg/transforms/http_test.go index 8e16aa504..79c07922d 100644 --- a/pkg/transforms/http_test.go +++ b/pkg/transforms/http_test.go @@ -26,9 +26,9 @@ import ( "strings" "testing" - bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" - mocks2 "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/interfaces/mocks" - "github.com/edgexfoundry/go-mod-bootstrap/v3/di" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/container" + mocks2 "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/interfaces/mocks" + "github.com/edgexfoundry/go-mod-bootstrap/v4/di" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/transforms/jsonlogic.go b/pkg/transforms/jsonlogic.go index c72e0a6a6..b877b8ba8 100644 --- a/pkg/transforms/jsonlogic.go +++ b/pkg/transforms/jsonlogic.go @@ -25,8 +25,8 @@ import ( "github.com/diegoholiveira/jsonlogic/v3" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/util" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/util" ) // JSONLogic ... diff --git a/pkg/transforms/metrics.go b/pkg/transforms/metrics.go index c721f046d..7e61316fc 100644 --- a/pkg/transforms/metrics.go +++ b/pkg/transforms/metrics.go @@ -19,9 +19,9 @@ package transforms import ( "fmt" - "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" ) // MetricsProcessor contains functions to process the Metric DTO diff --git a/pkg/transforms/metrics_test.go b/pkg/transforms/metrics_test.go index 05cdb6ee0..5c03637dd 100644 --- a/pkg/transforms/metrics_test.go +++ b/pkg/transforms/metrics_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/transforms/mqttsecret.go b/pkg/transforms/mqttsecret.go index c2e788096..bc3a92fb9 100644 --- a/pkg/transforms/mqttsecret.go +++ b/pkg/transforms/mqttsecret.go @@ -23,16 +23,16 @@ import ( "time" MQTT "github.com/eclipse/paho.mqtt.golang" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/common" - bootstrapInterfaces "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" - coreCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/common" + bootstrapInterfaces "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" + coreCommon "github.com/edgexfoundry/go-mod-core-contracts/v4/common" gometrics "github.com/rcrowley/go-metrics" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/secure" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/util" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/secure" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/util" ) // MQTTSecretSender ... diff --git a/pkg/transforms/responsedata.go b/pkg/transforms/responsedata.go index 6a1fae3f4..cc4d8e640 100644 --- a/pkg/transforms/responsedata.go +++ b/pkg/transforms/responsedata.go @@ -19,8 +19,8 @@ package transforms import ( "fmt" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/util" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/util" ) // ResponseData houses transform for outputting data to configured trigger response, i.e. message bus diff --git a/pkg/transforms/responsedata_test.go b/pkg/transforms/responsedata_test.go index e7bec268b..3163750eb 100644 --- a/pkg/transforms/responsedata_test.go +++ b/pkg/transforms/responsedata_test.go @@ -20,8 +20,8 @@ import ( "encoding/json" "testing" - "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/v4/common" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/transforms/stringvaluesformatter.go b/pkg/transforms/stringvaluesformatter.go index f9f514fac..9c15b8fa8 100644 --- a/pkg/transforms/stringvaluesformatter.go +++ b/pkg/transforms/stringvaluesformatter.go @@ -17,7 +17,7 @@ package transforms import ( - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" ) // StringValuesFormatter defines a function signature to perform string formatting operations using an AppFunction payload. diff --git a/pkg/transforms/stringvaluesformatter_test.go b/pkg/transforms/stringvaluesformatter_test.go index 0ceed4e10..f75aadfe5 100644 --- a/pkg/transforms/stringvaluesformatter_test.go +++ b/pkg/transforms/stringvaluesformatter_test.go @@ -17,8 +17,8 @@ package transforms import ( - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/appfunction" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/appfunction" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" "github.com/google/uuid" "github.com/stretchr/testify/require" "testing" diff --git a/pkg/transforms/tags.go b/pkg/transforms/tags.go index 8bbc1bc4a..452aee6d6 100644 --- a/pkg/transforms/tags.go +++ b/pkg/transforms/tags.go @@ -19,9 +19,9 @@ package transforms import ( "fmt" - "github.com/edgexfoundry/app-functions-sdk-go/v3/pkg/interfaces" + "github.com/edgexfoundry/app-functions-sdk-go/v4/pkg/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos" ) // Tags contains the list of Tag key/values diff --git a/pkg/transforms/tags_test.go b/pkg/transforms/tags_test.go index 5aab271a2..d4bc77fd0 100644 --- a/pkg/transforms/tags_test.go +++ b/pkg/transforms/tags_test.go @@ -19,7 +19,7 @@ package transforms import ( "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/transforms/testmain_test.go b/pkg/transforms/testmain_test.go index ea515dbd3..e5e7e81e6 100644 --- a/pkg/transforms/testmain_test.go +++ b/pkg/transforms/testmain_test.go @@ -20,18 +20,18 @@ import ( "os" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/interfaces/mocks" - commonDtos "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/interfaces/mocks" + commonDtos "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos/common" "github.com/stretchr/testify/mock" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/appfunction" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/bootstrap/container" - "github.com/edgexfoundry/app-functions-sdk-go/v3/internal/common" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/appfunction" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/bootstrap/container" + "github.com/edgexfoundry/app-functions-sdk-go/v4/internal/common" - "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logger" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/logger" - bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v3/bootstrap/container" - "github.com/edgexfoundry/go-mod-bootstrap/v3/di" + bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v4/bootstrap/container" + "github.com/edgexfoundry/go-mod-bootstrap/v4/di" ) var lc logger.LoggingClient diff --git a/pkg/util/helpers_test.go b/pkg/util/helpers_test.go index 744ad872d..ef1dd57ee 100644 --- a/pkg/util/helpers_test.go +++ b/pkg/util/helpers_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos" "github.com/stretchr/testify/assert" )