docker: fix logging config parsing

Fixes https://groups.google.com/d/topic/nomad-tool/B3Uo6Kns2BI/discussion

docker: fix logging config parsing
Fixes https://groups.google.com/d/topic/nomad-tool/B3Uo6Kns2BI/discussion
5a8d9552 · Michael Schurter · 08864d5e · 5a8d9552 · 5a8d9552
Commit 5a8d9552 authored 6 years ago by Michael Schurter
Hide whitespace changes
Inline Side-by-side

Showing

with 3 additions and 1 deletion
+3 -1
--- a/drivers/docker/config.go
+++ b/drivers/docker/config.go
@@ -253,7 +253,7 @@ var (
 		"ipv6_address":       hclspec.NewAttr("ipv6_address", "string", false),
 		"labels":             hclspec.NewBlockAttrs("labels", "string", false),
 		"load":               hclspec.NewAttr("load", "string", false),
-		"logging": hclspec.NewBlockSet("logging", hclspec.NewObject(map[string]*hclspec.Spec{
+		"logging": hclspec.NewBlock("logging", false, hclspec.NewObject(map[string]*hclspec.Spec{
 			"type":   hclspec.NewAttr("type", "string", false),
 			"config": hclspec.NewBlockAttrs("config", "string", false),
 		})),

--- a/helper/pluginutils/hclutils/util_test.go
+++ b/helper/pluginutils/hclutils/util_test.go
@@ -356,6 +356,8 @@ func TestParseHclInterface_Hcl(t *testing.T) {
 						"tag": "driver-test",
 					},
 				},
+				Devices: []docker.DockerDevice{},
+				Mounts:  []docker.DockerMount{},
 			},
 			expectedType: &docker.TaskConfig{},
 		},