cli: fix typos in quota_init and spec parsing (#23891)

hashicorp · Aug 29, 2024 · 6700937 · 6700937
1 parent 8407a9f
commit 6700937
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 22 deletions.
diff --git a/command/quota_apply.go b/command/quota_apply.go
@@ -270,7 +270,7 @@ func parseQuotaResource(result *api.Resources, list *ast.ObjectList) error {
 		"cpu",
 		"memory",
 		"memory_max",
-		"devices",
+		"device",
 	}
 	if err := helper.CheckHCLKeys(listVal, valid); err != nil {
 		return multierror.Prefix(err, "resources ->")
@@ -282,7 +282,7 @@ func parseQuotaResource(result *api.Resources, list *ast.ObjectList) error {
 	}
 
 	// Manually parse
-	delete(m, "devices")
+	delete(m, "device")
 
 	if err := mapstructure.WeakDecode(m, result); err != nil {
 		return err

diff --git a/command/quota_init.go b/command/quota_init.go
@@ -123,8 +123,7 @@ limit {
     cpu        = 2500
     memory     = 1000
     memory_max = 1000
-    device {
-      name  = "nvidia/gpu/1080ti",
+    device "nvidia/gpu/1080ti" {
       count = 1,
     }
   }
@@ -134,23 +133,25 @@ limit {
 
 var defaultJsonQuotaSpec = strings.TrimSpace(`
 {
-	"Name": "default-quota",
-	"Description": "Limit the shared default namespace",
-	"Limits": [
-		{
-			"Region": "global",
-			"RegionLimit": {
-				"Cores": 0,
-				"CPU": 2500,
-				"MemoryMB": 1000,
-				"MemoryMaxMB": 1000
-				"Device": {
-					"Name": "nvidia/gpu/1080ti",
-					"Count": 1
-				},
-			},
-			"VariablesLimit": 1000
-		}
-	]
+  "Name": "default-quota",
+  "Description": "Limit the shared default namespace",
+  "Limits": [
+    {
+      "Region": "global",
+      "RegionLimit": {
+        "Cores": 0,
+        "CPU": 2500,
+        "MemoryMB": 1000,
+        "MemoryMaxMB": 1000,
+        "Devices": [
+          {
+            "Name": "nvidia/gpu/1080ti",
+            "Count": 1
+          }
+        ]
+      },
+      "VariablesLimit": 1000
+    }
+  ]
 }
 `)