Merge pull request #7608 from hashicorp/b-config-lower-case

Tweak declared hcl key casing in structs
hashicorp · May 1, 2020 · 7d62bce · 7d62bce
1 parent a3f0a4d
commit 7d62bce
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 1 deletion.
diff --git a/command/agent/config_parse_test.go b/command/agent/config_parse_test.go
@@ -116,6 +116,13 @@ var basicConfig = &Config{
 			RetryIntervalHCL: "15s",
 			RetryMaxAttempts: 3,
 		},
+		DefaultSchedulerConfig: &structs.SchedulerConfiguration{
+			PreemptionConfig: structs.PreemptionConfig{
+				SystemSchedulerEnabled:  true,
+				BatchSchedulerEnabled:   true,
+				ServiceSchedulerEnabled: true,
+			},
+		},
 	},
 	ACL: &ACLConfig{
 		Enabled:          true,

diff --git a/command/agent/testdata/basic.hcl b/command/agent/testdata/basic.hcl
@@ -122,6 +122,14 @@ server {
     retry_max      = 3
     retry_interval = "15s"
   }
+
+  default_scheduler_config {
+    preemption_config {
+      batch_scheduler_enabled   = true
+      system_scheduler_enabled  = true
+      service_scheduler_enabled = true
+    }
+  }
 }
 
 acl {

diff --git a/command/agent/testdata/basic.json b/command/agent/testdata/basic.json
@@ -238,6 +238,13 @@
         "1.1.1.1",
         "2.2.2.2"
       ],
+      "default_scheduler_config": [{
+        "preemption_config": [{
+          "batch_scheduler_enabled": true,
+          "system_scheduler_enabled": true,
+          "service_scheduler_enabled": true
+        }]
+      }],
       "upgrade_version": "0.8.0"
     }
   ],

diff --git a/nomad/structs/operator.go b/nomad/structs/operator.go
@@ -158,7 +158,7 @@ type PreemptionConfig struct {
 	BatchSchedulerEnabled bool `hcl:"batch_scheduler_enabled"`
 
 	// ServiceSchedulerEnabled specifies if preemption is enabled for service jobs
-	ServiceSchedulerEnabled bool `hcl:"service_Scheduler_enabled"`
+	ServiceSchedulerEnabled bool `hcl:"service_scheduler_enabled"`
 }
 
 // SchedulerSetConfigRequest is used by the Operator endpoint to update the