[VOL-2938]Failure seen when parsing adapter config
Change-Id: Ie044eb110c36fc4b7597457fa6b1f6c94cd1baff
diff --git a/internal/pkg/commands/events.go b/internal/pkg/commands/events.go
index f237878..43bfe75 100644
--- a/internal/pkg/commands/events.go
+++ b/internal/pkg/commands/events.go
@@ -270,9 +270,24 @@
i++
}
- evHeader := EventHeader{Category: model.GetEnumString(header, "category", cat),
- SubCategory: model.GetEnumString(header, "sub_category", subCat),
- Type: model.GetEnumString(header, "type", evType),
+ header_category, err := model.GetEnumString(header, "category", cat)
+ if err != nil {
+ return nil, err
+ }
+
+ header_subcategory, err := model.GetEnumString(header, "sub_category", subCat)
+ if err != nil {
+ return nil, err
+ }
+
+ header_type, err := model.GetEnumString(header, "type", evType)
+ if err != nil {
+ return nil, err
+ }
+
+ evHeader := EventHeader{Category: header_category,
+ SubCategory: header_subcategory,
+ Type: header_type,
Raised_ts: raised,
Reported_ts: reported,
Device_ids: device_id_keys,
diff --git a/internal/pkg/commands/message.go b/internal/pkg/commands/message.go
index ab0146f..0d9e2fb 100644
--- a/internal/pkg/commands/message.go
+++ b/internal/pkg/commands/message.go
@@ -257,7 +257,10 @@
return nil, err
}
iaMessageType := iaMessageTypeIntf.(int32)
- iaMessageTypeStr = model.GetEnumString(iaHeader, "type", iaMessageType)
+ iaMessageTypeStr, err = model.GetEnumString(iaHeader, "type", iaMessageType)
+ if err != nil {
+ return nil, err
+ }
toDeviceIdIntf, err := iaHeader.TryGetFieldByName("to_device_id")
if err != nil {
@@ -274,9 +277,13 @@
}
}
}
+ messageHeaderType, err := model.GetEnumString(header, "type", msgType)
+ if err != nil {
+ return nil, err
+ }
icHeader := MessageHeader{Id: id,
- Type: model.GetEnumString(header, "type", msgType),
+ Type: messageHeaderType,
FromTopic: fromTopic,
ToTopic: toTopic,
KeyTopic: keyTopic,