From bb85d6194c1d55c326deeda892e96e5f7ac5edb8 Mon Sep 17 00:00:00 2001
From: Manuel de Brito Fontes <aledbf@gmail.com>
Date: Fri, 11 Nov 2016 00:14:20 -0300
Subject: [PATCH] Remove gce data race in tests

---
 controllers/gce/backends/fakes.go | 55 ++++++++++++++++++-------------
 1 file changed, 33 insertions(+), 22 deletions(-)

diff --git a/controllers/gce/backends/fakes.go b/controllers/gce/backends/fakes.go
index a9fc4abe2..a5eb1d006 100644
--- a/controllers/gce/backends/fakes.go
+++ b/controllers/gce/backends/fakes.go
@@ -18,30 +18,42 @@ package backends
 
 import (
 	"fmt"
+
 	compute "google.golang.org/api/compute/v1"
 	"k8s.io/ingress/controllers/gce/utils"
+	"k8s.io/kubernetes/pkg/client/cache"
 )
 
 // NewFakeBackendServices creates a new fake backend services manager.
 func NewFakeBackendServices() *FakeBackendServices {
 	return &FakeBackendServices{
-		backendServices: []*compute.BackendService{},
+		backendServices: cache.NewStore(func(obj interface{}) (string, error) {
+			svc := obj.(*compute.BackendService)
+			return svc.Name, nil
+		}),
 	}
 }
 
 // FakeBackendServices fakes out GCE backend services.
 type FakeBackendServices struct {
-	backendServices []*compute.BackendService
+	backendServices cache.Store
 	calls           []int
 }
 
 // GetBackendService fakes getting a backend service from the cloud.
 func (f *FakeBackendServices) GetBackendService(name string) (*compute.BackendService, error) {
 	f.calls = append(f.calls, utils.Get)
-	for i := range f.backendServices {
-		if name == f.backendServices[i].Name {
-			return f.backendServices[i], nil
-		}
+	obj, exists, err := f.backendServices.GetByKey(name)
+	if !exists {
+		return nil, fmt.Errorf("Backend service %v not found", name)
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	svc := obj.(*compute.BackendService)
+	if name == svc.Name {
+		return svc, nil
 	}
 	return nil, fmt.Errorf("Backend service %v not found", name)
 }
@@ -50,37 +62,36 @@ func (f *FakeBackendServices) GetBackendService(name string) (*compute.BackendSe
 func (f *FakeBackendServices) CreateBackendService(be *compute.BackendService) error {
 	f.calls = append(f.calls, utils.Create)
 	be.SelfLink = be.Name
-	f.backendServices = append(f.backendServices, be)
-	return nil
+	return f.backendServices.Update(be)
 }
 
 // DeleteBackendService fakes backend service deletion.
 func (f *FakeBackendServices) DeleteBackendService(name string) error {
 	f.calls = append(f.calls, utils.Delete)
-	newBackends := []*compute.BackendService{}
-	for i := range f.backendServices {
-		if name != f.backendServices[i].Name {
-			newBackends = append(newBackends, f.backendServices[i])
-		}
+	svc, exists, err := f.backendServices.GetByKey(name)
+	if !exists {
+		return fmt.Errorf("Backend service %v not found", name)
 	}
-	f.backendServices = newBackends
-	return nil
+	if err != nil {
+		return err
+	}
+	return f.backendServices.Delete(svc)
 }
 
 // ListBackendServices fakes backend service listing.
 func (f *FakeBackendServices) ListBackendServices() (*compute.BackendServiceList, error) {
-	return &compute.BackendServiceList{Items: f.backendServices}, nil
+	var svcs []*compute.BackendService
+	for _, s := range f.backendServices.List() {
+		svc := s.(*compute.BackendService)
+		svcs = append(svcs, svc)
+	}
+	return &compute.BackendServiceList{Items: svcs}, nil
 }
 
 // UpdateBackendService fakes updating a backend service.
 func (f *FakeBackendServices) UpdateBackendService(be *compute.BackendService) error {
 	f.calls = append(f.calls, utils.Update)
-	for i := range f.backendServices {
-		if f.backendServices[i].Name == be.Name {
-			f.backendServices[i] = be
-		}
-	}
-	return nil
+	return f.backendServices.Update(be)
 }
 
 // GetHealth fakes getting backend service health.