use FakeClient as backend for RESTClient based unit tests (#469)

Co-authored-by: Alexey Kazakov <[email protected]> Co-authored-by: Francisc Munteanu <[email protected]>
codeready-toolchain · Oct 1, 2024 · 6d3e720 · 6d3e720
1 parent 503d232
commit 6d3e720
Show file tree

Hide file tree

Showing 22 changed files with 573 additions and 1,536 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -84,7 +84,7 @@ func main() {
 		}
 	}
 
-	app, err := server.NewInClusterApplication(cl)
+	app, err := server.NewInClusterApplication(cl, configuration.Namespace())
 	if err != nil {
 		panic(err.Error())
 	}

diff --git a/pkg/application/service/factory/service_factory.go b/pkg/application/service/factory/service_factory.go
@@ -88,6 +88,12 @@ func (s *ServiceFactory) WithVerificationServiceOption(opt verificationservice.V
 	s.verificationServiceOptions = append(s.verificationServiceOptions, opt)
 }
 
+func (s *ServiceFactory) WithSignupService(signupService service.SignupService) {
+	s.signupServiceFunc = func(_ ...signupservice.SignupServiceOption) service.SignupService {
+		return signupService
+	}
+}
+
 // Option an option to configure the Service Factory
 type Option func(f *ServiceFactory)
 
@@ -115,8 +121,10 @@ func NewServiceFactory(options ...Option) *ServiceFactory {
 		return verificationservice.NewVerificationService(f.getContext(), f.verificationServiceOptions...)
 	}
 
-	f.signupServiceFunc = func(_ ...signupservice.SignupServiceOption) service.SignupService {
-		return signupservice.NewSignupService(f.getContext(), f.signupServiceOptions...)
+	if f.signupServiceFunc == nil {
+		f.signupServiceFunc = func(_ ...signupservice.SignupServiceOption) service.SignupService {
+			return signupservice.NewSignupService(f.getContext(), f.signupServiceOptions...)
+		}
 	}
 
 	return f

diff --git a/pkg/controller/signup_test.go b/pkg/controller/signup_test.go
diff --git a/pkg/proxy/proxy_test.go b/pkg/proxy/proxy_test.go
@@ -928,8 +928,7 @@ func (s *TestProxySuite) newMemberClusterServiceWithMembers(serverURL string) ap
 	fakeClient := commontest.NewFakeClient(s.T(), route)
 	return service.NewMemberClusterService(
 		fake.MemberClusterServiceContext{
-			CrtClient: s,
-			Svcs:      s.Application,
+			Svcs: s.Application,
 		},
 		func(si *service.ServiceImpl) {
 			si.GetMembersFunc = func(_ ...commoncluster.Condition) []*commoncluster.CachedToolchainCluster {

diff --git a/pkg/proxy/service/cluster_service_test.go b/pkg/proxy/service/cluster_service_test.go
@@ -93,8 +93,7 @@ func (s *TestClusterServiceSuite) TestGetClusterAccess() {
 
 	svc := service.NewMemberClusterService(
 		fake.MemberClusterServiceContext{
-			CrtClient: s,
-			Svcs:      s.Application,
+			Svcs: s.Application,
 		},
 	)
 
@@ -196,8 +195,7 @@ func (s *TestClusterServiceSuite) TestGetClusterAccess() {
 				s.Run("no member clusters", func() {
 					svc := service.NewMemberClusterService(
 						fake.MemberClusterServiceContext{
-							CrtClient: s,
-							Svcs:      s.Application,
+							Svcs: s.Application,
 						},
 						func(si *service.ServiceImpl) {
 							si.GetMembersFunc = func(_ ...commoncluster.Condition) []*commoncluster.CachedToolchainCluster {
@@ -225,8 +223,7 @@ func (s *TestClusterServiceSuite) TestGetClusterAccess() {
 				s.Run("no member cluster with the given URL", func() {
 					svc := service.NewMemberClusterService(
 						fake.MemberClusterServiceContext{
-							CrtClient: s,
-							Svcs:      s.Application,
+							Svcs: s.Application,
 						},
 						func(si *service.ServiceImpl) {
 							si.GetMembersFunc = func(_ ...commoncluster.Condition) []*commoncluster.CachedToolchainCluster {
@@ -287,8 +284,7 @@ func (s *TestClusterServiceSuite) TestGetClusterAccess() {
 
 				svc := service.NewMemberClusterService(
 					fake.MemberClusterServiceContext{
-						CrtClient: s,
-						Svcs:      s.Application,
+						Svcs: s.Application,
 					},
 					func(si *service.ServiceImpl) {
 						si.GetMembersFunc = func(_ ...commoncluster.Condition) []*commoncluster.CachedToolchainCluster {
@@ -455,8 +451,7 @@ func (s *TestClusterServiceSuite) TestGetClusterAccess() {
 		s.Run("get workspace by name", func() {
 			svc := service.NewMemberClusterService(
 				fake.MemberClusterServiceContext{
-					CrtClient: s,
-					Svcs:      s.Application,
+					Svcs: s.Application,
 				},
 				func(si *service.ServiceImpl) {
 					si.GetMembersFunc = func(_ ...commoncluster.Condition) []*commoncluster.CachedToolchainCluster {

diff --git a/pkg/server/in_cluster_application.go b/pkg/server/in_cluster_application.go
@@ -4,7 +4,6 @@ import (
 	"github.com/codeready-toolchain/registration-service/pkg/application"
 	"github.com/codeready-toolchain/registration-service/pkg/application/service"
 	"github.com/codeready-toolchain/registration-service/pkg/application/service/factory"
-	"github.com/codeready-toolchain/registration-service/pkg/configuration"
 	"github.com/codeready-toolchain/registration-service/pkg/kubeclient"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
@@ -13,17 +12,17 @@ import (
 // application type is intended to run inside a Kubernetes cluster, where it makes use of the rest.InClusterConfig()
 // function to determine which Kubernetes configuration to use to create the REST client that interacts with the
 // Kubernetes service endpoints.
-func NewInClusterApplication(client client.Client) (application.Application, error) {
-	kubeClient, err := kubeclient.NewCRTRESTClient(client, configuration.Namespace())
+func NewInClusterApplication(client client.Client, namespace string, options ...factory.Option) (application.Application, error) {
+	kubeClient, err := kubeclient.NewCRTRESTClient(client, namespace)
 	if err != nil {
 		return nil, err
 	}
 
 	return &InClusterApplication{
-		serviceFactory: factory.NewServiceFactory(
+		serviceFactory: factory.NewServiceFactory(append(options,
 			factory.WithServiceContextOptions(factory.CRTClientOption(kubeClient),
 				factory.InformerOption(client),
-			)),
+			))...),
 	}, nil
 }
 

diff --git a/pkg/signup/service/resource_provider.go b/pkg/signup/service/resource_provider.go
@@ -14,26 +14,26 @@ type ResourceProvider interface {
 	ListSpaceBindings(reqs ...labels.Requirement) ([]toolchainv1alpha1.SpaceBinding, error)
 }
 
-type crtClientProvider struct {
-	cl kubeclient.CRTClient
+type CrtClientProvider struct {
+	Cl kubeclient.CRTClient
 }
 
-func (p crtClientProvider) GetMasterUserRecord(name string) (*toolchainv1alpha1.MasterUserRecord, error) {
-	return p.cl.V1Alpha1().MasterUserRecords().Get(name)
+func (p CrtClientProvider) GetMasterUserRecord(name string) (*toolchainv1alpha1.MasterUserRecord, error) {
+	return p.Cl.V1Alpha1().MasterUserRecords().Get(name)
 }
 
-func (p crtClientProvider) GetToolchainStatus() (*toolchainv1alpha1.ToolchainStatus, error) {
-	return p.cl.V1Alpha1().ToolchainStatuses().Get()
+func (p CrtClientProvider) GetToolchainStatus() (*toolchainv1alpha1.ToolchainStatus, error) {
+	return p.Cl.V1Alpha1().ToolchainStatuses().Get()
 }
 
-func (p crtClientProvider) GetUserSignup(name string) (*toolchainv1alpha1.UserSignup, error) {
-	return p.cl.V1Alpha1().UserSignups().Get(name)
+func (p CrtClientProvider) GetUserSignup(name string) (*toolchainv1alpha1.UserSignup, error) {
+	return p.Cl.V1Alpha1().UserSignups().Get(name)
 }
 
-func (p crtClientProvider) GetSpace(name string) (*toolchainv1alpha1.Space, error) {
-	return p.cl.V1Alpha1().Spaces().Get(name)
+func (p CrtClientProvider) GetSpace(name string) (*toolchainv1alpha1.Space, error) {
+	return p.Cl.V1Alpha1().Spaces().Get(name)
 }
 
-func (p crtClientProvider) ListSpaceBindings(reqs ...labels.Requirement) ([]toolchainv1alpha1.SpaceBinding, error) {
-	return p.cl.V1Alpha1().SpaceBindings().ListSpaceBindings(reqs...)
+func (p CrtClientProvider) ListSpaceBindings(reqs ...labels.Requirement) ([]toolchainv1alpha1.SpaceBinding, error) {
+	return p.Cl.V1Alpha1().SpaceBindings().ListSpaceBindings(reqs...)
 }
diff --git a/pkg/signup/service/signup_service.go b/pkg/signup/service/signup_service.go
@@ -57,7 +57,7 @@ func NewSignupService(context servicecontext.ServiceContext, opts ...SignupServi
 
 	s := &ServiceImpl{
 		BaseService:     base.NewBaseService(context),
-		defaultProvider: crtClientProvider{context.CRTClient()},
+		defaultProvider: CrtClientProvider{context.CRTClient()},
 		CaptchaChecker:  captcha.Helper{},
 	}