From 1ab3b2314cdf23a5f37b24a9d4f80f8c4e1ddd2d Mon Sep 17 00:00:00 2001
From: Diptanu Choudhury <diptanuc@gmail.com>
Date: Fri, 18 Dec 2015 10:56:45 -0800
Subject: [PATCH 1/2] Throwing an error if ports are not named

---
 jobspec/parse.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/jobspec/parse.go b/jobspec/parse.go
index 765f58b3adae..b20631adb0a3 100644
--- a/jobspec/parse.go
+++ b/jobspec/parse.go
@@ -623,6 +623,9 @@ func parsePorts(networkObj *ast.ObjectList, nw *structs.NetworkResource) error {
 	portsObjList := networkObj.Filter("port")
 	knownPortLabels := make(map[string]bool)
 	for _, port := range portsObjList.Items {
+		if len(port.Keys) == 0 {
+			return fmt.Errorf("Nomad expects ports to be named")
+		}
 		label := port.Keys[0].Token.Value().(string)
 		if !reDynamicPorts.MatchString(label) {
 			return errPortLabel

From 68107919dec4f30ca80458d36b0f8975320c7ffb Mon Sep 17 00:00:00 2001
From: Diptanu Choudhury <diptanuc@gmail.com>
Date: Fri, 18 Dec 2015 12:07:27 -0800
Subject: [PATCH 2/2] Changed the error message

---
 jobspec/parse.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jobspec/parse.go b/jobspec/parse.go
index b20631adb0a3..3559744fd964 100644
--- a/jobspec/parse.go
+++ b/jobspec/parse.go
@@ -624,7 +624,7 @@ func parsePorts(networkObj *ast.ObjectList, nw *structs.NetworkResource) error {
 	knownPortLabels := make(map[string]bool)
 	for _, port := range portsObjList.Items {
 		if len(port.Keys) == 0 {
-			return fmt.Errorf("Nomad expects ports to be named")
+			return fmt.Errorf("Ports must be named")
 		}
 		label := port.Keys[0].Token.Value().(string)
 		if !reDynamicPorts.MatchString(label) {