(choria-io#2169) Pass choria federations to external discovery agent

config/config.go

@@ -255,6 +255,7 @@ func NewConfigForTests() *Config {
 	c.DisableSecurityProviderVerify = true
 	c.LogFile = "discard"
 	c.RPCAuthorization = false
+	c.Choria.FederationCollectives = []string{"alpha", "beta"}
 
 	return c
 }

providers/discovery/external/external.go

@@ -71,7 +71,7 @@ func (e *External) Discover(ctx context.Context, opts ...DiscoverOption) (n []st
 		collective:  e.fw.Configuration().MainCollective,
 		timeout:     e.timeout,
 		command:     e.fw.Configuration().Choria.ExternalDiscoveryCommand,
-		federations: e.fw.FederationCollectives(),
+		federations: e.fw.Configuration().Choria.FederationCollectives,
 		do:          make(map[string]string),
 	}
 

providers/discovery/external/external_test.go

@@ -56,16 +56,19 @@ var _ = Describe("External", func() {
 	})
 
 	Describe("Discover", func() {
-		It("Should request and return discovered nodes", func() {
+		wd, _ := os.Getwd()
+		var f *protocol.Filter
+		BeforeEach(func() {
 			if runtime.GOOS == "windows" {
 				Skip("not tested on windows")
 			}
 
-			f := protocol.NewFilter()
+			f = protocol.NewFilter()
 			f.AddAgentFilter("rpcutil")
-			f.AddFactFilter("country", "==", "mt")
-
-			wd, _ := os.Getwd()
+			err := f.AddFactFilter("country", "==", "mt")
+			Expect(err).ToNot(HaveOccurred())
+		})
+		It("Should request and return discovered nodes", func() {
 			cfg.Choria.ExternalDiscoveryCommand = filepath.Join(wd, "testdata/good.rb")
 			nodes, err := e.Discover(context.Background(), Filter(f), DiscoveryOptions(map[string]string{"foo": "bar"}))
 			Expect(err).ToNot(HaveOccurred())
@@ -82,27 +85,12 @@ var _ = Describe("External", func() {
 				Skip("not tested on windows")
 			}
 
-			f := protocol.NewFilter()
-			f.AddAgentFilter("rpcutil")
-			f.AddFactFilter("country", "==", "mt")
-
-			wd, _ := os.Getwd()
 			cfg.Choria.ExternalDiscoveryCommand = filepath.Join(wd, "testdata/missing.rb")
 			cmd := filepath.Join(wd, "testdata/good_with_argument.rb") + " discover --test"
 			nodes, err := e.Discover(context.Background(), Filter(f), DiscoveryOptions(map[string]string{"command": cmd, "foo": "bar"}))
 			Expect(err).ToNot(HaveOccurred())
 			Expect(nodes).To(Equal([]string{"one", "two"}))
 		})
-
-		Context("Should pass CHORIA_FED_COLLECTIVE when the value is set", func() {
-			BeforeEach(func() {
-				cfg.Choria.FederationCollectives = []string{"alpha", "beta"}
-				fw.EXPECT().FederationCollectives().Return([]string{"alpha", "beta"}).AnyTimes()
-			})
-			It("Should contain the list of collectives", func() {
-				Expect(cfg.Choria.FederationCollectives).To(ContainElements([]string{"alpha", "beta"}))
-			})
-		})
 	})
 })
 

providers/discovery/external/testdata/good.rb

@@ -30,7 +30,7 @@ def write_output(output)
     "identity" => []
   },
   "collective" => "ginkgo",
-  "federations" => [],
+  "federations" => ["alpha", "beta"],
   "timeout" => 2,
 }