diff --git a/go.mod b/go.mod index c6685a3c..a80fabdb 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module edgexfoundry/app-rfid-llrp-inventory go 1.18 require ( - github.com/edgexfoundry/app-functions-sdk-go/v3 v3.0.0-dev.9 + github.com/edgexfoundry/app-functions-sdk-go/v3 v3.0.0-dev.15 github.com/edgexfoundry/go-mod-core-contracts/v3 v3.0.0-dev.2 github.com/google/uuid v1.3.0 github.com/gorilla/mux v1.8.0 @@ -19,9 +19,9 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/diegoholiveira/jsonlogic/v3 v3.2.6 // indirect github.com/eclipse/paho.mqtt.golang v1.4.2 // indirect - github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.5 // indirect + github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.7 // indirect github.com/edgexfoundry/go-mod-configuration/v3 v3.0.0-dev.2 // indirect - github.com/edgexfoundry/go-mod-messaging/v3 v3.0.0-dev.2 // indirect + github.com/edgexfoundry/go-mod-messaging/v3 v3.0.0-dev.3 // indirect github.com/edgexfoundry/go-mod-registry/v3 v3.0.0-dev.3 // indirect github.com/edgexfoundry/go-mod-secrets/v3 v3.0.0-dev.1 // indirect github.com/fatih/color v1.9.0 // indirect diff --git a/go.sum b/go.sum index 2acb1cd3..0c1d62f0 100644 --- a/go.sum +++ b/go.sum @@ -45,16 +45,16 @@ github.com/diegoholiveira/jsonlogic/v3 v3.2.6 h1:EV607wRY72hT3V90ZOQw+zjXR9KIUV9 github.com/diegoholiveira/jsonlogic/v3 v3.2.6/go.mod h1:9oE8z9G+0OMxOoLHF3fhek3KuqD5CBqM0B6XFL08MSg= github.com/eclipse/paho.mqtt.golang v1.4.2 h1:66wOzfUHSSI1zamx7jR6yMEI5EuHnT1G6rNA5PM12m4= github.com/eclipse/paho.mqtt.golang v1.4.2/go.mod h1:JGt0RsEwEX+Xa/agj90YJ9d9DH2b7upDZMK9HRbFvCA= -github.com/edgexfoundry/app-functions-sdk-go/v3 v3.0.0-dev.9 h1:tSasBvfVwscDcuqLON65TplNreQe+LjZB7MUOhu7+Po= -github.com/edgexfoundry/app-functions-sdk-go/v3 v3.0.0-dev.9/go.mod h1:rDrEMtfZDpnDXR4ocLNi+9IowvjqpRaTGHVgkKU+WpY= -github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.5 h1:3WMWQ0oi++KFrau/e8BOTqgzORCa3G7bLG0w/wO72Io= -github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.5/go.mod h1:cGXMUtbbzw+npJpMcFHPlXIN+ZPF71aiimhJ6v8kaSc= +github.com/edgexfoundry/app-functions-sdk-go/v3 v3.0.0-dev.15 h1:dJnD514JgWFYKOMVFJtiwDgM34622Zdbxe/bmEC0xVw= +github.com/edgexfoundry/app-functions-sdk-go/v3 v3.0.0-dev.15/go.mod h1:Tx5zi/LgGvjElKzwCFaHWRSFYGBpVII7rOxB0BwYvvg= +github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.7 h1:e0H7V7aFl9vC06ZUUQUzNpjqTQWs/XvdV/EKmk8zF/E= +github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.7/go.mod h1:yW5dumg9IyfrHx4NYC5Ii0WVVB5OjTXQ/8/NkHHif5Q= github.com/edgexfoundry/go-mod-configuration/v3 v3.0.0-dev.2 h1:xp5MsP+qf/fuJxy8fT7k1N+c4j4C6w04qMCBXm6id7o= github.com/edgexfoundry/go-mod-configuration/v3 v3.0.0-dev.2/go.mod h1:1Vv4uWAo6r7k6jUlqVJW8JOL6YKVBc6sRL8Al3DrMck= github.com/edgexfoundry/go-mod-core-contracts/v3 v3.0.0-dev.2 h1:tleTxhbBISfDNn596rU71n+GOy27dMIme+v8Vl0uhpw= github.com/edgexfoundry/go-mod-core-contracts/v3 v3.0.0-dev.2/go.mod h1:7RwSq896VqelvSU7zYKs2tpZhgELVFECkiGf6XGLKfQ= -github.com/edgexfoundry/go-mod-messaging/v3 v3.0.0-dev.2 h1:bNXJHfxTo/1SzQbiJQUnySUGVP5i2FNwFsXQ+RzqR8Q= -github.com/edgexfoundry/go-mod-messaging/v3 v3.0.0-dev.2/go.mod h1:G0Vxoc8+JXwUqRH5ggyOZ/f/CIVPTswI5Ld7dI5uhIY= +github.com/edgexfoundry/go-mod-messaging/v3 v3.0.0-dev.3 h1:+el2HxEt02uFXXBmHK8gWETPklNbPg4wvYln/4/ooHo= +github.com/edgexfoundry/go-mod-messaging/v3 v3.0.0-dev.3/go.mod h1:G0Vxoc8+JXwUqRH5ggyOZ/f/CIVPTswI5Ld7dI5uhIY= github.com/edgexfoundry/go-mod-registry/v3 v3.0.0-dev.3 h1:QgZF9f70Cwpvkjw3tP1aiVGHc+yNFJNzW6hO8pDs3fg= github.com/edgexfoundry/go-mod-registry/v3 v3.0.0-dev.3/go.mod h1:2w8v0sv+i21nY+DY6JV4PFxsNTuxpGAjlNFlFMTfZkk= github.com/edgexfoundry/go-mod-secrets/v3 v3.0.0-dev.1 h1:dib+mZUuHqwVHt9pKAWC4lh60Fbc+6vKrD919LaknwI= diff --git a/res/configuration.toml b/res/configuration.toml index e3b86349..ad72ee0b 100644 --- a/res/configuration.toml +++ b/res/configuration.toml @@ -89,40 +89,38 @@ ServerName = "" EndpointSocket = "/tmp/edgex/secrets/spiffe/public/api.sock" RequiredSecrets = "redisdb" +[MessageBus] +Protocol = "redis" +Host = "localhost" +Port = 6379 +Type = "redis" +AuthMode = "usernamepassword" # required for redis messagebus (secure or insecure). +SecretName = "redisdb" + [MessageBus.Topics] + SubscribeTopics = "edgex/events/#/#/#/ROAccessReport,edgex/events/#/#/#/ReaderEventNotification" + PublishTopic="edgex/events/device/{profilename}/{devicename}/{sourcename}" # publish to same topic format the Device Services use + [MessageBus.Optional] + # Default MQTT Specific options that need to be here to enable evnironment variable overrides of them + ClientId ="app-rfid-llrp-inventory" + Qos = "0" # Quality of Sevice values are 0 (At most once), 1 (At least once) or 2 (Exactly once) + KeepAlive = "10" # Seconds (must be 2 or greater) + Retained = "false" + AutoReconnect = "true" + ConnectTimeout = "5" # Seconds + SkipCertVerify = "false" + # Additional Default NATS Specific options that need to be here to enable evnironment variable overrides of them + Format = "nats" + RetryOnFailedConnect = "true" + QueueGroup = "" + Durable = "" + AutoProvision = "true" + Deliver = "new" + DefaultPubRetryAttempts = "2" + Subject = "edgex/#" # Required for NATS Jetstram only for stream autoprovsioning + [Trigger] +# Note that the MessaegBus connection above is used by edgex-messagebus trigger Type="edgex-messagebus" - [Trigger.EdgexMessageBus] - Type = "redis" - [Trigger.EdgexMessageBus.SubscribeHost] - Host = "localhost" - Port = 6379 - Protocol = "redis" - SubscribeTopics="edgex/events/#/#/#/ROAccessReport,edgex/events/#/#/#/ReaderEventNotification" - [Trigger.EdgexMessageBus.PublishHost] - Host = "localhost" - Port = 6379 - Protocol = "redis" - PublishTopic="edgex/events/device/{profilename}/{devicename}/{sourcename}" # publish to same topic format the Device Services use - [Trigger.EdgexMessageBus.Optional] - authmode = "usernamepassword" # required for redis messagebus (secure or insecure). - secretname = "redisdb" - # Default MQTT Specific options that need to be here to enable environment variable overrides of them - ClientId ="app-rfid-llrp-inventory" - Qos = "0" # Quality of Service values are 0 (At most once), 1 (At least once) or 2 (Exactly once) - KeepAlive = "10" # Seconds (must be 2 or greater) - Retained = "false" - AutoReconnect = "true" - ConnectTimeout = "5" # Seconds - SkipCertVerify = "false" - # Default NATS Specific options that need to be here to enable environment variable overrides of them - Format = "nats" - RetryOnFailedConnect = "true" - QueueGroup = "" - Durable = "" - AutoProvision = "true" - Deliver = "new" - DefaultPubRetryAttempts = "2" - Subject = "edgex/#" # Required for NATS JetStream only for stream auto provisioning [AppCustom] # Every device(reader) + antenna port represents a tag location and can be assigned an alias