From 5effbca6b2ca3caa333ee4bcfc6da0008337766a Mon Sep 17 00:00:00 2001 From: Leonard Goodell Date: Mon, 2 Jan 2023 10:09:59 -0700 Subject: [PATCH] refactor: Adjust to MessageBus config with single broker host info Signed-off-by: Leonard Goodell --- bootstrap/handlers/messaging.go | 7 +------ go.mod | 2 ++ go.sum | 2 -- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/bootstrap/handlers/messaging.go b/bootstrap/handlers/messaging.go index 98854222..d334669f 100644 --- a/bootstrap/handlers/messaging.go +++ b/bootstrap/handlers/messaging.go @@ -54,12 +54,7 @@ func MessagingBootstrapHandler(ctx context.Context, wg *sync.WaitGroup, startupT msgClient, err := messaging.NewMessageClient( types.MessageBusConfig{ - PublishHost: types.HostInfo{ - Host: messageBusInfo.Host, - Port: messageBusInfo.Port, - Protocol: messageBusInfo.Protocol, - }, - SubscribeHost: types.HostInfo{ + Broker: types.HostInfo{ Host: messageBusInfo.Host, Port: messageBusInfo.Port, Protocol: messageBusInfo.Protocol, diff --git a/go.mod b/go.mod index 2328adca..0712d060 100644 --- a/go.mod +++ b/go.mod @@ -2,6 +2,8 @@ module github.com/edgexfoundry/go-mod-bootstrap/v3 go 1.18 +replace github.com/edgexfoundry/go-mod-messaging/v3 => ../go-mod-messaging + require ( github.com/eclipse/paho.mqtt.golang v1.4.2 github.com/edgexfoundry/go-mod-configuration/v3 v3.0.0-dev.2 diff --git a/go.sum b/go.sum index fa06c449..65a05858 100644 --- a/go.sum +++ b/go.sum @@ -45,8 +45,6 @@ github.com/edgexfoundry/go-mod-configuration/v3 v3.0.0-dev.2 h1:xp5MsP+qf/fuJxy8 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-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=