From 6da9fdd2e2015294364c3dfa59a7e446b01bbe5b Mon Sep 17 00:00:00 2001
From: Andy Bursavich <abursavich@gmail.com>
Date: Wed, 21 Jul 2021 09:25:32 -0700
Subject: [PATCH] source: remove NewFakeConfigStore one-liner

---
 source/gateway_test.go        | 13 ++++---------
 source/store_test.go          |  3 ++-
 source/virtualservice_test.go |  9 +++++----
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/source/gateway_test.go b/source/gateway_test.go
index 12addfbba..9f34f3d4d 100644
--- a/source/gateway_test.go
+++ b/source/gateway_test.go
@@ -26,7 +26,6 @@ import (
 	"github.com/stretchr/testify/suite"
 	networkingv1alpha3api "istio.io/api/networking/v1alpha3"
 	networkingv1alpha3 "istio.io/client-go/pkg/apis/networking/v1alpha3"
-	istioclient "istio.io/client-go/pkg/clientset/versioned"
 	istiofake "istio.io/client-go/pkg/clientset/versioned/fake"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -46,7 +45,7 @@ type GatewaySuite struct {
 
 func (suite *GatewaySuite) SetupTest() {
 	fakeKubernetesClient := fake.NewSimpleClientset()
-	fakeIstioClient := NewFakeConfigStore()
+	fakeIstioClient := istiofake.NewSimpleClientset()
 	var err error
 
 	suite.lbServices = []*v1.Service{
@@ -137,7 +136,7 @@ func TestNewIstioGatewaySource(t *testing.T) {
 		t.Run(ti.title, func(t *testing.T) {
 			_, err := NewIstioGatewaySource(
 				fake.NewSimpleClientset(),
-				NewFakeConfigStore(),
+				istiofake.NewSimpleClientset(),
 				"",
 				ti.annotationFilter,
 				ti.fqdnTemplate,
@@ -1142,7 +1141,7 @@ func testGatewayEndpoints(t *testing.T) {
 				require.NoError(t, err)
 			}
 
-			fakeIstioClient := NewFakeConfigStore()
+			fakeIstioClient := istiofake.NewSimpleClientset()
 			for _, config := range ti.configItems {
 				gatewayCfg := config.Config()
 				_, err := fakeIstioClient.NetworkingV1alpha3().Gateways(ti.targetNamespace).Create(context.Background(), &gatewayCfg, metav1.CreateOptions{})
@@ -1175,7 +1174,7 @@ func testGatewayEndpoints(t *testing.T) {
 // gateway specific helper functions
 func newTestGatewaySource(loadBalancerList []fakeIngressGatewayService) (*gatewaySource, error) {
 	fakeKubernetesClient := fake.NewSimpleClientset()
-	fakeIstioClient := NewFakeConfigStore()
+	fakeIstioClient := istiofake.NewSimpleClientset()
 
 	for _, lb := range loadBalancerList {
 		service := lb.Service()
@@ -1276,7 +1275,3 @@ func (c fakeGatewayConfig) Config() networkingv1alpha3.Gateway {
 
 	return gw
 }
-
-func NewFakeConfigStore() istioclient.Interface {
-	return istiofake.NewSimpleClientset()
-}
diff --git a/source/store_test.go b/source/store_test.go
index 4fa787bbf..27a31e8e4 100644
--- a/source/store_test.go
+++ b/source/store_test.go
@@ -25,6 +25,7 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
 	istioclient "istio.io/client-go/pkg/clientset/versioned"
+	istiofake "istio.io/client-go/pkg/clientset/versioned/fake"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
 	fakeKube "k8s.io/client-go/kubernetes/fake"
@@ -93,7 +94,7 @@ func (suite *ByNamesTestSuite) TestAllInitialized() {
 
 	mockClientGenerator := new(MockClientGenerator)
 	mockClientGenerator.On("KubeClient").Return(fakeKube.NewSimpleClientset(), nil)
-	mockClientGenerator.On("IstioClient").Return(NewFakeConfigStore(), nil)
+	mockClientGenerator.On("IstioClient").Return(istiofake.NewSimpleClientset(), nil)
 	mockClientGenerator.On("DynamicKubernetesClient").Return(fakeDynamic, nil)
 
 	sources, err := ByNames(mockClientGenerator, []string{"service", "ingress", "istio-gateway", "contour-ingressroute", "contour-httpproxy", "kong-tcpingress", "fake"}, minimalConfig)
diff --git a/source/virtualservice_test.go b/source/virtualservice_test.go
index ab9aeebf6..39f427d0d 100644
--- a/source/virtualservice_test.go
+++ b/source/virtualservice_test.go
@@ -28,6 +28,7 @@ import (
 	"github.com/stretchr/testify/suite"
 	istionetworking "istio.io/api/networking/v1alpha3"
 	networkingv1alpha3 "istio.io/client-go/pkg/apis/networking/v1alpha3"
+	istiofake "istio.io/client-go/pkg/clientset/versioned/fake"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes/fake"
 
@@ -47,7 +48,7 @@ type VirtualServiceSuite struct {
 
 func (suite *VirtualServiceSuite) SetupTest() {
 	fakeKubernetesClient := fake.NewSimpleClientset()
-	fakeIstioClient := NewFakeConfigStore()
+	fakeIstioClient := istiofake.NewSimpleClientset()
 	var err error
 
 	suite.lbServices = []*v1.Service{
@@ -158,7 +159,7 @@ func TestNewIstioVirtualServiceSource(t *testing.T) {
 		t.Run(ti.title, func(t *testing.T) {
 			_, err := NewIstioVirtualServiceSource(
 				fake.NewSimpleClientset(),
-				NewFakeConfigStore(),
+				istiofake.NewSimpleClientset(),
 				"",
 				ti.annotationFilter,
 				ti.fqdnTemplate,
@@ -1451,7 +1452,7 @@ func testVirtualServiceEndpoints(t *testing.T) {
 				require.NoError(t, err)
 			}
 
-			fakeIstioClient := NewFakeConfigStore()
+			fakeIstioClient := istiofake.NewSimpleClientset()
 
 			for _, gateway := range gateways {
 				_, err := fakeIstioClient.NetworkingV1alpha3().Gateways(gateway.Namespace).Create(context.Background(), &gateway, metav1.CreateOptions{})
@@ -1520,7 +1521,7 @@ func testGatewaySelectorMatchesService(t *testing.T) {
 
 func newTestVirtualServiceSource(loadBalancerList []fakeIngressGatewayService, gwList []fakeGatewayConfig) (*virtualServiceSource, error) {
 	fakeKubernetesClient := fake.NewSimpleClientset()
-	fakeIstioClient := NewFakeConfigStore()
+	fakeIstioClient := istiofake.NewSimpleClientset()
 
 	for _, lb := range loadBalancerList {
 		service := lb.Service()