hcl: add new cores resources field

hashicorp · Jul 26, 2021 · a4e9c11 · a4e9c11
1 parent 09903f4
commit a4e9c11
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 0 deletions.
diff --git a/jobspec/parse_task.go b/jobspec/parse_task.go
@@ -551,6 +551,7 @@ func parseResources(result *api.Resources, list *ast.ObjectList) error {
 		"memory_max",
 		"network",
 		"device",
+		"cores",
 	}
 	if err := checkHCLKeys(listVal, valid); err != nil {
 		return multierror.Prefix(err, "resources ->")

diff --git a/jobspec/parse_test.go b/jobspec/parse_test.go
@@ -1699,6 +1699,30 @@ func TestParse(t *testing.T) {
 			},
 			false,
 		},
+		{
+			"resources-cores.hcl",
+			&api.Job{
+				ID:   stringToPtr("cores-test"),
+				Name: stringToPtr("cores-test"),
+				TaskGroups: []*api.TaskGroup{
+					{
+						Count: intToPtr(5),
+						Name:  stringToPtr("group"),
+						Tasks: []*api.Task{
+							{
+								Name:   "task",
+								Driver: "docker",
+								Resources: &api.Resources{
+									Cores:    intToPtr(4),
+									MemoryMB: intToPtr(128),
+								},
+							},
+						},
+					},
+				},
+			},
+			false,
+		},
 	}
 
 	for _, tc := range cases {

diff --git a/jobspec/test-fixtures/resources-cores.hcl b/jobspec/test-fixtures/resources-cores.hcl
@@ -0,0 +1,14 @@
+job "cores-test" {
+  group "group" {
+    count = 5
+
+    task "task" {
+      driver = "docker"
+
+      resources {
+        cores  = 4
+        memory = 128
+      }
+    }
+  }
+}