Making CRDAppFactory an interface

Signed-off-by: Yash Sethiya <[email protected]>
carvel-dev · Feb 26, 2024 · eaa0ae7 · eaa0ae7
1 parent 8d2a1c9
commit eaa0ae7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/cmd/controller/run.go b/cmd/controller/run.go
@@ -205,7 +205,7 @@ func Run(opts Options, runLog logr.Logger) error {
 			CacheFolder: cacheFolderApps,
 		}
 		reconciler := app.NewReconciler(kcClient, runLog.WithName("app"),
-			appFactory, refTracker, updateStatusTracker, compInfo)
+			&appFactory, refTracker, updateStatusTracker, compInfo)
 
 		ctrl, err := controller.New("app", mgr, controller.Options{
 			Reconciler: NewUniqueReconciler(&ErrReconciler{

diff --git a/pkg/app/app_factory.go b/pkg/app/app_factory.go
@@ -21,6 +21,10 @@ import (
 	"k8s.io/client-go/kubernetes"
 )
 
+type ICRDAppFactory interface {
+	NewCRDApp(*kcv1alpha1.App, logr.Logger) *CRDApp
+}
+
 // CRDAppFactory allows to create CRDApps.
 type CRDAppFactory struct {
 	CoreClient       kubernetes.Interface

diff --git a/pkg/app/reconciler.go b/pkg/app/reconciler.go
@@ -27,14 +27,14 @@ import (
 type Reconciler struct {
 	appClient       kcclient.Interface
 	log             logr.Logger
-	crdAppFactory   CRDAppFactory
+	crdAppFactory   ICRDAppFactory
 	appRefTracker   *reftracker.AppRefTracker
 	appUpdateStatus *reftracker.AppUpdateStatus
 	componentInfo   ComponentInfo
 }
 
 // NewReconciler constructs new Reconciler.
-func NewReconciler(appClient kcclient.Interface, log logr.Logger, crdAppFactory CRDAppFactory,
+func NewReconciler(appClient kcclient.Interface, log logr.Logger, crdAppFactory ICRDAppFactory,
 	appRefTracker *reftracker.AppRefTracker, appUpdateStatus *reftracker.AppUpdateStatus, componentInfo ComponentInfo) *Reconciler {
 	return &Reconciler{appClient: appClient,
 		log:             log,

diff --git a/pkg/app/reconciler_test.go b/pkg/app/reconciler_test.go
@@ -38,7 +38,7 @@ func Test_AppRefTracker_HasAppRemovedForSecrets_ThatAreNoLongerUsedByApp(t *test
 	appKey := reftracker.NewAppKey(app.Name, app.Namespace)
 	appRefTracker.ReconcileRefs(refKeyMap, appKey)
 
-	ar := apppkg.NewReconciler(nil, testr.New(t), apppkg.CRDAppFactory{}, appRefTracker, nil, FakeComponentInfo{})
+	ar := apppkg.NewReconciler(nil, testr.New(t), &apppkg.CRDAppFactory{}, appRefTracker, nil, FakeComponentInfo{})
 
 	// This map represents the secrets the App has on its spec
 	refMap := map[reftracker.RefKey]struct{}{
@@ -90,7 +90,7 @@ func Test_AppRefTracker_HasNoAppsRemoved_WhenRefsRemainSame(t *testing.T) {
 	appKey := reftracker.NewAppKey(app.Name, app.Namespace)
 	appRefTracker.ReconcileRefs(refKeyMap, appKey)
 
-	ar := apppkg.NewReconciler(nil, testr.New(t), apppkg.CRDAppFactory{}, appRefTracker, nil, FakeComponentInfo{})
+	ar := apppkg.NewReconciler(nil, testr.New(t), &apppkg.CRDAppFactory{}, appRefTracker, nil, FakeComponentInfo{})
 
 	// This map represents the secrets the App has
 	// on its spec