build: Upgrade dependency libs

Upgrade go-mod-bootstrap and go-mod-core-contracts. Close #4673 Signed-off-by: bruce <weichou1229@gmail.com>
edgexfoundry · Sep 14, 2023 · df42bd9 · df42bd9
1 parent 4cb232a
commit df42bd9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/go.mod b/go.mod
@@ -4,9 +4,9 @@ go 1.21
 
 require (
 	github.com/eclipse/paho.mqtt.golang v1.4.3
-	github.com/edgexfoundry/go-mod-bootstrap/v3 v3.1.0-dev.32
+	github.com/edgexfoundry/go-mod-bootstrap/v3 v3.1.0-dev.36
 	github.com/edgexfoundry/go-mod-configuration/v3 v3.1.0-dev.5
-	github.com/edgexfoundry/go-mod-core-contracts/v3 v3.1.0-dev.9
+	github.com/edgexfoundry/go-mod-core-contracts/v3 v3.1.0-dev.13
 	github.com/edgexfoundry/go-mod-messaging/v3 v3.1.0-dev.20
 	github.com/edgexfoundry/go-mod-secrets/v3 v3.1.0-dev.6
 	github.com/fxamacker/cbor/v2 v2.5.0

diff --git a/go.sum b/go.sum
@@ -26,12 +26,12 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/eclipse/paho.mqtt.golang v1.4.3 h1:2kwcUGn8seMUfWndX0hGbvH8r7crgcJguQNCyp70xik=
 github.com/eclipse/paho.mqtt.golang v1.4.3/go.mod h1:CSYvoAlsMkhYOXh/oKyxa8EcBci6dVkLCbo5tTC1RIE=
-github.com/edgexfoundry/go-mod-bootstrap/v3 v3.1.0-dev.32 h1:UhWAi2oyRa8alqOXPyFWdMOcG0pCUoIVNMkOgP5xRQE=
-github.com/edgexfoundry/go-mod-bootstrap/v3 v3.1.0-dev.32/go.mod h1:eC4dNTeMuXJ9h+i4F4Mqj464U0UCmLXWMh6rsHAPPHg=
+github.com/edgexfoundry/go-mod-bootstrap/v3 v3.1.0-dev.36 h1:zCdZFPSArKhTKGHWDpDPzLLRIpDfTPA1N3NsE/gjKTU=
+github.com/edgexfoundry/go-mod-bootstrap/v3 v3.1.0-dev.36/go.mod h1:k/dJYGezHt13V2IUvuX9uubgsz+zyFITLQ/3Hs+rs+w=
 github.com/edgexfoundry/go-mod-configuration/v3 v3.1.0-dev.5 h1:wTs2qOG/RHeizCHcPp8KOQcSzGrvNOhVQnK+JdAHJNs=
 github.com/edgexfoundry/go-mod-configuration/v3 v3.1.0-dev.5/go.mod h1:mZyBGQ7eX+K63b46/K/OdiWSHtYbl/TK2GTfc0eOM6Q=
-github.com/edgexfoundry/go-mod-core-contracts/v3 v3.1.0-dev.9 h1:ZvCeuB1CXzNzg2WhpLCEKhkPSZpS0Geoh0AqTbj08X4=
-github.com/edgexfoundry/go-mod-core-contracts/v3 v3.1.0-dev.9/go.mod h1:L7i97+A+bMpvXFo1M6t0WHeRrsSocTgDEl3ayfVxCmo=
+github.com/edgexfoundry/go-mod-core-contracts/v3 v3.1.0-dev.13 h1:guSGxvTDHc7SUjoOgRAUnXpsU60OwQZCbh1RAjjcQBY=
+github.com/edgexfoundry/go-mod-core-contracts/v3 v3.1.0-dev.13/go.mod h1:MztlrH+8hPRX6XNZrbdvbV0RNgkoAN1etcvAtgSHeuQ=
 github.com/edgexfoundry/go-mod-messaging/v3 v3.1.0-dev.20 h1:iKhaDrfN0plO95MjPmrOEhfiUrE9gMD9Os7odtOrM10=
 github.com/edgexfoundry/go-mod-messaging/v3 v3.1.0-dev.20/go.mod h1:cD3WRffguDrR/G7dIyzYewfoOk44VlJfGSkgbuUzvYM=
 github.com/edgexfoundry/go-mod-registry/v3 v3.1.0-dev.5 h1:Xu1Jxk8gjMGMROqOf2C5pLY6lx1nWNYSDife2d623UE=

diff --git a/internal/core/command/controller/messaging/external.go b/internal/core/command/controller/messaging/external.go
@@ -60,7 +60,7 @@ func commandQueryHandler(dic *di.Container) mqtt.MessageHandler {
 		}
 
 		externalMQTTInfo := container.ConfigurationFrom(dic.Get).ExternalMQTT
-		responseTopic := externalMQTTInfo.Topics[common.ExternalCommandQueryResponseTopicKey]
+		responseTopic := externalMQTTInfo.Topics[common.CommandQueryResponseTopicKey]
 		if responseTopic == "" {
 			lc.Error("QueryResponseTopic not provided in External.Topics")
 			lc.Warn("Not publishing error message back due to insufficient information on response topic")
@@ -137,7 +137,7 @@ func commandRequestHandler(requestTimeout time.Duration, dic *di.Container) mqtt
 			return
 		}
 
-		externalResponseTopic := common.BuildTopic(externalMQTTInfo.Topics[common.ExternalCommandResponseTopicPrefixKey], deviceName, commandName, method)
+		externalResponseTopic := common.BuildTopic(externalMQTTInfo.Topics[common.CommandResponseTopicPrefixKey], deviceName, commandName, method)
 
 		internalBaseTopic := config.MessageBus.GetBaseTopicPrefix()
 		topicPrefix := common.BuildTopic(internalBaseTopic, common.CoreCommandDeviceRequestPublishTopic)

diff --git a/internal/core/command/controller/messaging/external_test.go b/internal/core/command/controller/messaging/external_test.go
@@ -65,10 +65,10 @@ func TestOnConnectHandler(t *testing.T) {
 			return &config.ConfigurationStruct{
 				ExternalMQTT: bootstrapConfig.ExternalMQTTInfo{
 					Topics: map[string]string{
-						common.CommandRequestTopicKey:                testExternalCommandRequestTopic,
-						common.ExternalCommandResponseTopicPrefixKey: testExternalCommandResponseTopicPrefix,
-						common.CommandQueryRequestTopicKey:           testQueryRequestTopic,
-						common.ExternalCommandQueryResponseTopicKey:  testQueryResponseTopic,
+						common.CommandRequestTopicKey:        testExternalCommandRequestTopic,
+						common.CommandResponseTopicPrefixKey: testExternalCommandResponseTopicPrefix,
+						common.CommandQueryRequestTopicKey:   testQueryRequestTopic,
+						common.CommandQueryResponseTopicKey:  testQueryResponseTopic,
 					},
 					QoS:    0,
 					Retain: true,
@@ -171,7 +171,7 @@ func Test_commandQueryHandler(t *testing.T) {
 					QoS:    0,
 					Retain: true,
 					Topics: map[string]string{
-						common.ExternalCommandQueryResponseTopicKey: testQueryResponseTopic,
+						common.CommandQueryResponseTopicKey: testQueryResponseTopic,
 					},
 				},
 			}
@@ -298,7 +298,7 @@ func Test_commandRequestHandler(t *testing.T) {
 					QoS:    0,
 					Retain: true,
 					Topics: map[string]string{
-						common.ExternalCommandResponseTopicPrefixKey: testExternalCommandResponseTopicPrefix,
+						common.CommandResponseTopicPrefixKey: testExternalCommandResponseTopicPrefix,
 					},
 				},
 			}