From e7fe5aa4524566afb40c8de01425eff956f4c9a5 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Thu, 11 Sep 2014 19:50:41 -0700 Subject: [PATCH] config: Append works with modules --- config/append.go | 7 +++++++ config/append_test.go | 10 ++++++++++ 2 files changed, 17 insertions(+) diff --git a/config/append.go b/config/append.go index de7b2c8247..f87e677480 100644 --- a/config/append.go +++ b/config/append.go @@ -29,6 +29,13 @@ func Append(c1, c2 *Config) (*Config, error) { } } + if len(c1.Modules) > 0 || len(c2.Modules) > 0 { + c.Modules = make( + []*Module, 0, len(c1.Modules)+len(c2.Modules)) + c.Modules = append(c.Modules, c1.Modules...) + c.Modules = append(c.Modules, c2.Modules...) + } + if len(c1.Outputs) > 0 || len(c2.Outputs) > 0 { c.Outputs = make( []*Output, 0, len(c1.Outputs)+len(c2.Outputs)) diff --git a/config/append_test.go b/config/append_test.go index 4a7fb9d1e7..e7aea9d214 100644 --- a/config/append_test.go +++ b/config/append_test.go @@ -12,6 +12,9 @@ func TestAppend(t *testing.T) { }{ { &Config{ + Modules: []*Module{ + &Module{Name: "foo"}, + }, Outputs: []*Output{ &Output{Name: "foo"}, }, @@ -29,6 +32,9 @@ func TestAppend(t *testing.T) { }, &Config{ + Modules: []*Module{ + &Module{Name: "bar"}, + }, Outputs: []*Output{ &Output{Name: "bar"}, }, @@ -46,6 +52,10 @@ func TestAppend(t *testing.T) { }, &Config{ + Modules: []*Module{ + &Module{Name: "foo"}, + &Module{Name: "bar"}, + }, Outputs: []*Output{ &Output{Name: "foo"}, &Output{Name: "bar"},