Warn for no name

Dynamic version constraint error message
Only warn for version constraint when it's a constraint field

Author: JackyChiu

manifest.go

@@ -39,6 +39,7 @@ var (
 	errRootPruneContainsName   = errors.Errorf("%q should not include a name", "prune")
 	errInvalidRootPruneValue   = errors.New("root prune options must be omitted instead of being set to false")
 	errInvalidPruneProjectName = errors.Errorf("%q in %q must be a string", "name", "prune.project")
+	errNoName                  = errors.New("no name provided")
 )
 
 // Manifest holds manifest file data and implements gps.RootManifest.
@@ -158,8 +159,10 @@ func validateManifest(s string) ([]error, error) {
 								warns = append(warns, fmt.Errorf("invalid key %q in %q", key, prop))
 							}
 						}
-						if !ruleProvided && len(props) > 0 {
-							warns = append(warns, fmt.Errorf("version rule or source should be provided in %q", prop))
+						if _, ok := props["name"]; !ok {
+							warns = append(warns, errNoName)
+						} else if !ruleProvided && prop == "constraint" {
+							warns = append(warns, fmt.Errorf("branch, version, revision, or source should be provided for %q", props["name"]))
 						}
 					}
 				}

manifest_test.go

@@ -255,7 +255,7 @@ func TestValidateManifest(t *testing.T) {
 			`,
 			wantWarn: []error{
 				errInvalidMetadata,
-				errors.New("version rule or source should be provided in \"constraint\""),
+				errors.New("branch, version, revision, or source should be provided for \"github.com/foo/bar\""),
 			},
 			wantError: nil,
 		},
@@ -266,7 +266,7 @@ func TestValidateManifest(t *testing.T) {
 			  name = "github.com/foo/bar"
 			`,
 			wantWarn: []error{
-				errors.New("version rule or source should be provided in \"constraint\""),
+				errors.New("branch, version, revision, or source should be provided for \"github.com/foo/bar\""),
 			},
 			wantError: nil,
 		},
@@ -275,7 +275,9 @@ func TestValidateManifest(t *testing.T) {
 			tomlString: `
 			[[constraint]]
 			`,
-			wantWarn:  []error{},
+			wantWarn: []error{
+				errNoName,
+			},
 			wantError: nil,
 		},
 		{
@@ -300,17 +302,17 @@ func TestValidateManifest(t *testing.T) {
 			[[override]]
 			  name = "github.com/foo/bar"
 			`,
-			wantWarn: []error{
-				errors.New("version rule or source should be provided in \"override\""),
-			},
+			wantWarn:  []error{},
 			wantError: nil,
 		},
 		{
 			name: "empty override",
 			tomlString: `
 			[[override]]
 			`,
-			wantWarn:  []error{},
+			wantWarn: []error{
+				errNoName,
+			},
 			wantError: nil,
 		},
 		{
@@ -344,10 +346,10 @@ func TestValidateManifest(t *testing.T) {
 			wantWarn: []error{
 				errors.New("Invalid key \"location\" in \"constraint\""),
 				errors.New("Invalid key \"link\" in \"constraint\""),
-				errors.New("version rule or source should be provided in \"constraint\""),
-				errors.New("Invalid key \"nick\" in \"override\""),
 				errors.New("metadata in \"constraint\" should be a TOML table"),
-				errors.New("version rule or source should be provided in \"override\""),
+				errors.New("branch, version, revision, or source should be provided for \"github.com/foo/bar\""),
+				errors.New("Invalid key \"nick\" in \"override\""),
+				errNoName,
 			},
 			wantError: nil,
 		},
@@ -361,7 +363,7 @@ func TestValidateManifest(t *testing.T) {
 			    color = "blue"
 			`,
 			wantWarn: []error{
-				errors.New("version rule or source should be provided in \"constraint\""),
+				errors.New("branch, version, revision, or source should be provided for \"github.com/foo/bar\""),
 			},
 			wantError: nil,
 		},