From 18e1a599edc75ede7c49bece5fb9010684124c15 Mon Sep 17 00:00:00 2001
From: Mahmood Ali <mahmood@hashicorp.com>
Date: Fri, 26 Mar 2021 16:11:26 -0400
Subject: [PATCH] oversubscription: add memory_max to hclv1

Allow specifying the `memory_max` field in HCL under the resources block.

Though HCLv1 is deprecated, I've updated them to ease our testing.
---
 jobspec/parse_task.go           | 1 +
 jobspec/parse_test.go           | 5 +++--
 jobspec/test-fixtures/basic.hcl | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/jobspec/parse_task.go b/jobspec/parse_task.go
index d43198bf2..71e6af26b 100644
--- a/jobspec/parse_task.go
+++ b/jobspec/parse_task.go
@@ -548,6 +548,7 @@ func parseResources(result *api.Resources, list *ast.ObjectList) error {
 		"iops", // COMPAT(0.10): Remove after one release to allow it to be removed from jobspecs
 		"disk",
 		"memory",
+		"memory_max",
 		"network",
 		"device",
 	}
diff --git a/jobspec/parse_test.go b/jobspec/parse_test.go
index b0f397f1b..9e1138860 100644
--- a/jobspec/parse_test.go
+++ b/jobspec/parse_test.go
@@ -285,8 +285,9 @@ func TestParse(t *testing.T) {
 									"LOREM": "ipsum",
 								},
 								Resources: &api.Resources{
-									CPU:      intToPtr(500),
-									MemoryMB: intToPtr(128),
+									CPU:         intToPtr(500),
+									MemoryMB:    intToPtr(128),
+									MemoryMaxMB: intToPtr(256),
 									Networks: []*api.NetworkResource{
 										{
 											MBits:         intToPtr(100),
diff --git a/jobspec/test-fixtures/basic.hcl b/jobspec/test-fixtures/basic.hcl
index 900a894ad..107ffaca1 100644
--- a/jobspec/test-fixtures/basic.hcl
+++ b/jobspec/test-fixtures/basic.hcl
@@ -227,8 +227,9 @@ job "binstore-storagelocker" {
       }
 
       resources {
-        cpu    = 500
-        memory = 128
+        cpu        = 500
+        memory     = 128
+        memory_max = 256
 
         network {
           mbits = "100"