Replace metadata array of tables with just table

- Makes metadata TOML table.
- Allows metadata table in "dependencies" and "overrides".

Author: darkowlzz

manifest.go

@@ -8,6 +8,7 @@ import (
 	"bytes"
 	"fmt"
 	"io"
+	"reflect"
 	"sort"
 
 	"github.com/golang/dep/gps"
@@ -54,24 +55,26 @@ func validateManifest(s string) ([]error, error) {
 	for prop, val := range manifest {
 		switch prop {
 		case "metadata":
-			// Invalid if type assertion fails. Not a TOML array of tables.
-			// This check is enough for map validation because any non-key-value
-			// pair inside array of tables becomes an invalid TOML and parser
-			// would fail.
-			if _, ok := val.([]interface{}); !ok {
-				errs = append(errs, errors.New("metadata should be a TOML array of tables"))
+			// Check if metadata is of Map type
+			if reflect.TypeOf(val).Kind() != reflect.Map {
+				errs = append(errs, errors.New("metadata should be a TOML table"))
 			}
 		case "dependencies", "overrides":
 			// Invalid if type assertion fails. Not a TOML array of tables.
 			if rawProj, ok := val.([]interface{}); ok {
 				// Iterate through each array of tables
 				for _, v := range rawProj {
 					// Check the individual field's key to be valid
-					for key, _ := range v.(map[string]interface{}) {
+					for key, value := range v.(map[string]interface{}) {
 						// Check if the key is valid
 						switch key {
 						case "name", "branch", "revision", "version", "source":
 							// valid key
+						case "metadata":
+							// Check if metadata is of Map type
+							if reflect.TypeOf(value).Kind() != reflect.Map {
+								errs = append(errs, fmt.Errorf("metadata in %q should be a TOML table", prop))
+							}
 						default:
 							// unknown/invalid key
 							errs = append(errs, fmt.Errorf("Invalid key %q in %q", key, prop))

manifest_test.go

@@ -135,7 +135,7 @@ func TestValidateManifest(t *testing.T) {
 		},
 		{
 			tomlString: `
-			[[metadata]]
+			[metadata]
 			  authors = "foo"
 			  version = "1.0.0"
 			`,
@@ -166,7 +166,7 @@ func TestValidateManifest(t *testing.T) {
 			[[dependencies]]
 			  name = "github.com/foo/bar"
 			`,
-			want: []error{errors.New("metadata should be a TOML array of tables")},
+			want: []error{errors.New("metadata should be a TOML table")},
 		},
 		{
 			tomlString: `
@@ -184,6 +184,7 @@ func TestValidateManifest(t *testing.T) {
 			  name = "github.com/foo/bar"
 			  location = "some-value"
 			  link = "some-other-value"
+			  metadata = "foo"
 
 			[[overrides]]
 			  nick = "foo"
@@ -192,8 +193,19 @@ func TestValidateManifest(t *testing.T) {
 				errors.New("Invalid key \"location\" in \"dependencies\""),
 				errors.New("Invalid key \"link\" in \"dependencies\""),
 				errors.New("Invalid key \"nick\" in \"overrides\""),
+				errors.New("metadata in \"dependencies\" should be a TOML table"),
 			},
 		},
+		{
+			tomlString: `
+			[[dependencies]]
+			  name = "github.com/foo/bar"
+
+			  [dependencies.metadata]
+			    color = "blue"
+			`,
+			want: []error{},
+		},
 	}
 
 	// constains for error