Revert "use keys (#2167)" (#2188)

This reverts commit 974ed086f25ad45a01947e276e2eb8aa73d007a3.

1 files changed, 12 insertions, 15 deletions

diff --git a/plugin/federation/kubernetes_api_test.go b/plugin/federation/kubernetes_api_test.go
index 2fa274a6d..4b62605d1 100644
--- a/plugin/federation/kubernetes_api_test.go
+++ b/plugin/federation/kubernetes_api_test.go
@@ -16,24 +16,22 @@ type APIConnFederationTest struct {
 func (APIConnFederationTest) HasSynced() bool                           { return true }
 func (APIConnFederationTest) Run()                                      { return }
 func (APIConnFederationTest) Stop() error                               { return nil }
-func (APIConnFederationTest) SvcIndexReverse(string) *object.Service  { return nil }
-func (APIConnFederationTest) EpIndexReverse(string) *object.Endpoints { return nil }
+func (APIConnFederationTest) SvcIndexReverse(string) []*object.Service  { return nil }
+func (APIConnFederationTest) EpIndexReverse(string) []*object.Endpoints { return nil }
 func (APIConnFederationTest) Modified() int64                           { return 0 }
 func (APIConnFederationTest) SetWatchChan(watch.Chan)                   {}
 func (APIConnFederationTest) Watch(string) error                        { return nil }
 func (APIConnFederationTest) StopWatching(string)                       {}
 
-
 func (APIConnFederationTest) PodIndex(string) []*object.Pod {
 	return []*object.Pod{
 		{Namespace: "podns", PodIP: "10.240.0.1"}, // Remote IP set in test.ResponseWriter
 	}
 }
 
-
-func (APIConnFederationTest) SvcIndex(key string) *object.Service {
-	svcs := map[string]*object.Service{
-		"testns/svc1": {
+func (APIConnFederationTest) SvcIndex(string) []*object.Service {
+	svcs := []*object.Service{
+		{
 			Name:      "svc1",
 			Namespace: "testns",
 			ClusterIP: "10.0.0.1",
@@ -41,12 +39,12 @@ func (APIConnFederationTest) SvcIndex(key string) *object.Service {
 				{Name: "http", Protocol: "tcp", Port: 80},
 			},
 		},
-		"testns/hdls1": {
+		{
 			Name:      "hdls1",
 			Namespace: "testns",
 			ClusterIP: api.ClusterIPNone,
 		},
-		"testns/external": {
+		{
 			Name:         "external",
 			Namespace:    "testns",
 			ExternalName: "ext.interwebs.test",
@@ -55,10 +53,9 @@ func (APIConnFederationTest) SvcIndex(key string) *object.Service {
 			},
 		},
 	}
-	return svcs[key]
+	return svcs
 }
 
-
 func (APIConnFederationTest) ServiceList() []*object.Service {
 	svcs := []*object.Service{
 		{
@@ -86,9 +83,9 @@ func (APIConnFederationTest) ServiceList() []*object.Service {
 	return svcs
 }
 
-func (APIConnFederationTest) EpIndex(key string) *object.Endpoints {
-	eps := map[string]*object.Endpoints{
-		"testns/svc1": {
+func (APIConnFederationTest) EpIndex(string) []*object.Endpoints {
+	eps := []*object.Endpoints{
+		{
 			Subsets: []object.EndpointSubset{
 				{
 					Addresses: []object.EndpointAddress{
@@ -103,7 +100,7 @@ func (APIConnFederationTest) EpIndex(key string) *object.Endpoints {
 			Namespace: "testns",
 		},
 	}
-	return eps[key]
+	return eps
 }
 
 func (APIConnFederationTest) EndpointsList() []*object.Endpoints {