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

inter/imocks/util.go

@@ -96,6 +96,7 @@ func NewFrameworkForTests(ctrl *gomock.Controller, logWriter io.Writer, opts ...
 	fw.EXPECT().Configuration().Return(mopts.cfg).AnyTimes()
 	fw.EXPECT().Logger(gomock.AssignableToTypeOf("")).Return(logrus.NewEntry(logger)).AnyTimes()
 	fw.EXPECT().NewRequestID().Return(util.RandomHexString(), nil).AnyTimes()
+	fw.EXPECT().FederationCollectives().Return([]string{}).AnyTimes()
 	fw.EXPECT().HasCollective(gomock.AssignableToTypeOf("")).DoAndReturn(func(c string) bool {
 		for _, collective := range fw.Configuration().Collectives {
 			if c == collective {

providers/discovery/external/external_test.go

@@ -97,10 +97,15 @@ var _ = Describe("External", func() {
 		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"}))
 			})
 		})
 	})
 })
+
+func RunExternalCommands() {
+
+}

providers/discovery/external/testdata/good.rb

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

providers/discovery/external/testdata/good_with_federations.rb

@@ -0,0 +1,41 @@
+#!/usr/bin/env ruby
+
+require "json"
+require "pp"
+
+def write_output(output)
+  File.open(ENV["CHORIA_EXTERNAL_REPLY"], "w") {|f|
+    f.puts(output.to_json)
+  }
+  exit
+end
+
+if ENV["CHORIA_EXTERNAL_PROTOCOL"] != "io.choria.choria.discovery.v1.external_request"
+  write_output({"error" => "invalid protocol"})
+  exit
+end
+
+request = JSON.parse(File.read(ENV["CHORIA_EXTERNAL_REQUEST"]))
+expected = {
+  "$schema" => "https://choria.io/schemas/choria/discovery/v1/external_request.json",
+  "options" => {
+  	"foo" => "bar"
+  },
+  "protocol" => "io.choria.choria.discovery.v1.external_request",
+  "filter" => {
+    "fact" => [{"fact" => "country", "operator"=>"==","value"=>"mt"}],
+    "cf_class"=>[],
+    "agent" => ["rpcutil"],
+    "compound" => [],
+    "identity" => []
+  },
+  "collective" => "ginkgo",
+  "federations" => ["alpha", "beta"]
+  "timeout" => 2,
+}
+
+if request != expected
+  write_output({"error" => "invalid filter received: "+request.pretty_inspect})
+else
+  write_output({"protocol" => "io.choria.choria.discovery.v1.external_reply", "nodes" => ["one","two"]})
+end