Check for mapKey schema field

Return error when needed mapKey schema field is not set. Change-Id: I48e1c08ee9cace27448fbe6f32e15b75b0576a62 Partial-Bug: #1785278
Juniper · Aug 27, 2018 · 35334ed · 35334ed
1 parent e3231e2
commit 35334ed
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/pkg/db/cassandra/cassandra.go b/pkg/db/cassandra/cassandra.go
@@ -435,12 +435,12 @@ func NewAmqpEventProcessor() *AmqpEventProcessor {
 
 //AmqpMessage type
 type AmqpMessage struct {
-	RequestID string   `json:"request_id"`
-	Oper      string   `json:"oper"`
-	Type      string   `json:"type"`
-	UUID      string   `json:"uuid"`
-	FqName    []string `json:"fq_name"`
-	Data      json.RawMessage   `json:"obj_dict"`
+	RequestID string          `json:"request_id"`
+	Oper      string          `json:"oper"`
+	Type      string          `json:"type"`
+	UUID      string          `json:"uuid"`
+	FqName    []string        `json:"fq_name"`
+	Data      json.RawMessage `json:"obj_dict"`
 }
 
 //Process sends msg to amqp exchange

diff --git a/pkg/schema/schema.go b/pkg/schema/schema.go
@@ -693,7 +693,7 @@ func (api *API) resolveExtend() error {
 
 func (api *API) resolveCollectionTypes() error {
 	for _, s := range api.Schemas {
-		for _, property := range s.JSONSchema.Properties {
+		for propertyName, property := range s.JSONSchema.Properties {
 			if property.CollectionType != "" {
 				propertyType := api.Types[property.ProtoType]
 
@@ -703,7 +703,9 @@ func (api *API) resolveCollectionTypes() error {
 				propertyType.CollectionType = property.CollectionType
 
 				if propertyType.CollectionType == "map" {
-					resolveMapCollectionType(property, propertyType)
+					if err := resolveMapCollectionType(property, propertyType); err != nil {
+						return errors.Wrapf(err, "invalid %q property of %q schema", propertyName, s.ID)
+					}
 				}
 			}
 		}
@@ -721,9 +723,13 @@ func checkCollectionTypes(property, propertyType *JSONSchema) error {
 	return nil
 }
 
-func resolveMapCollectionType(property, propertyType *JSONSchema) {
-	itemType := propertyType.OrderedProperties[0].Items
-	propertyType.MapKeyProperty = itemType.Properties[property.MapKey]
+func resolveMapCollectionType(property, propertyType *JSONSchema) error {
+	if property.MapKey == "" {
+		return errors.New("empty mapKey field")
+	}
+
+	propertyType.MapKeyProperty = propertyType.OrderedProperties[0].Items.Properties[property.MapKey]
+	return nil
 }
 
 //MakeAPI load directory and generate API definitions.