Merge pull request #957 from forgedhallpass/master

Changed the "custom-fields" attribute to "additional-fields"

v2/pkg/model/model.go

@@ -12,13 +12,13 @@ import (
 )
 
 type Info struct {
-	Name           string                  `json:"name" yaml:"name"`
-	Authors        StringSlice             `json:"author" yaml:"author"`
-	Tags           StringSlice             `json:"tags" yaml:"tags"`
-	Description    string                  `json:"description" yaml:"description"`
-	Reference      StringSlice             `json:"reference" yaml:"reference"`
-	SeverityHolder severity.SeverityHolder `json:"severity" yaml:"severity"`
-	CustomFields   map[string]string       `json:"custom-fields,omitempty" yaml:"custom-fields,omitempty"`
+	Name             string                  `json:"name" yaml:"name"`
+	Authors          StringSlice             `json:"author" yaml:"author"`
+	Tags             StringSlice             `json:"tags" yaml:"tags"`
+	Description      string                  `json:"description" yaml:"description"`
+	Reference        StringSlice             `json:"reference" yaml:"reference"`
+	SeverityHolder   severity.SeverityHolder `json:"severity" yaml:"severity"`
+	AdditionalFields map[string]string       `json:"additional-fields,omitempty" yaml:"additional-fields,omitempty"`
 }
 
 // StringSlice represents a single (in-lined) or multiple string value(s).

v2/pkg/model/model_test.go

@@ -50,7 +50,7 @@ func TestUnmarshal(t *testing.T) {
 		assert.Equal(t, info.Tags.ToSlice(), tags)
 		assert.Equal(t, info.SeverityHolder.Severity, severity.Critical)
 		assert.Equal(t, info.Reference.ToSlice(), references)
-		assert.Equal(t, info.CustomFields, dynamicKeysMap)
+		assert.Equal(t, info.AdditionalFields, dynamicKeysMap)
 		return info
 	}
 
@@ -60,7 +60,7 @@ func TestUnmarshal(t *testing.T) {
   tags: ` + strings.Join(tags, ", ") + `
   severity: critical
   reference: ` + strings.Join(references, ", ") + `
-  custom-fields:
+  additional-fields:
      ` + dynamicKey1 + `: ` + dynamicKeysMap[dynamicKey1] + `
      ` + dynamicKey2 + `: ` + dynamicKeysMap[dynamicKey2] + `
 `
@@ -76,7 +76,7 @@ func TestUnmarshal(t *testing.T) {
   reference:
     - ` + references[0] + ` # comments are not unmarshalled
     - ` + references[1] + `
-  custom-fields:
+  additional-fields:
      ` + dynamicKey1 + `: ` + dynamicKeysMap[dynamicKey1] + `
      ` + dynamicKey2 + `: ` + dynamicKeysMap[dynamicKey2] + `
 `

v2/pkg/reporting/format/format.go

@@ -171,7 +171,7 @@ func ToMarkdownTableString(templateInfo *model.Info) string {
 	}
 
 	toMarkDownTable(fields)
-	toMarkDownTable(utils.NewInsertionOrderedStringMap(templateInfo.CustomFields))
+	toMarkDownTable(utils.NewInsertionOrderedStringMap(templateInfo.AdditionalFields))
 
 	return builder.String()
 }

v2/pkg/reporting/format/format_test.go

@@ -18,7 +18,7 @@ func TestToMarkdownTableString(t *testing.T) {
 		SeverityHolder: severity.SeverityHolder{Severity: severity.High},
 		Tags:           model.StringSlice{Value: []string{"cve", "misc"}},
 		Reference:      model.StringSlice{Value: "reference1"},
-		CustomFields: map[string]string{
+		AdditionalFields: map[string]string{
 			"customDynamicKey1": "customDynamicValue1",
 			"customDynamicKey2": "customDynamicValue2",
 		},