Merge pull request #28 from m-lab/sandbox-soltesz

Prevent cached results and add test to check for error

aeflex/aeflex.go

@@ -116,6 +116,7 @@ func NewService(project string) (*Service, error) {
 func (source *Service) Discover(ctx context.Context) ([]discovery.StaticConfig, error) {
 	// List all services.
 	services := 0
+	source.targets = []discovery.StaticConfig{}
 	err := source.api.ServicesPages(
 		ctx, func(listSvc *appengine.ListServicesResponse) error {
 			services += len(listSvc.Services)

aeflex/aeflex_test.go

@@ -289,6 +289,15 @@ func TestService_Discover(t *testing.T) {
 			if !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("Service.Discover() = %v, want %v", got, tt.want)
 			}
+			// Call Discover again, to verify it returns the same set of targets.
+			got2, err := source.Discover(tt.ctx)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("Service.Discover() error = %v", err)
+				return
+			}
+			if !reflect.DeepEqual(got, got2) {
+				t.Errorf("Service.Discover() = %v, want %v", got, got2)
+			}
 		})
 	}
 }