Remove client get from repo reconciler (nephio-project#437)

5GSEC · Aug 2, 2024 · 63ae05e · 63ae05e
1 parent b6c0465
commit 63ae05e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/controllers/pkg/giteaclient/giteaclient.go b/controllers/pkg/giteaclient/giteaclient.go
@@ -33,6 +33,7 @@ import (
 
 type GiteaClient interface {
 	Start(ctx context.Context)
+	IsInitialized() bool
 	Get() *gitea.Client
 	GetMyUserInfo() (*gitea.User, *gitea.Response, error)
 	DeleteRepo(owner string, repo string) (*gitea.Response, error)
@@ -138,6 +139,10 @@ func getClientAuth(secret *corev1.Secret) gitea.ClientOption {
 	return gitea.SetBasicAuth(string(secret.Data["username"]), string(secret.Data["password"]))
 }
 
+func (r *gc) IsInitialized() bool {
+	return r.giteaClient != nil
+}
+
 func (r *gc) Get() *gitea.Client {
 	return r.giteaClient
 }

diff --git a/controllers/pkg/reconcilers/repository/reconciler.go b/controllers/pkg/reconcilers/repository/reconciler.go
@@ -100,8 +100,7 @@ func (r *reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 	}
 
 	// check if client exists otherwise retry
-	giteaClient := r.giteaClient.Get()
-	if giteaClient == nil {
+	if !r.giteaClient.IsInitialized() {
 		err := fmt.Errorf("gitea server unreachable")
 		log.Error(err, "cannot connect to git server")
 		cr.SetConditions(infrav1alpha1.Failed(err.Error()))

diff --git a/controllers/pkg/reconcilers/repository/reconciler_test.go b/controllers/pkg/reconcilers/repository/reconciler_test.go
@@ -35,6 +35,10 @@ type NephioGiteaClientMock struct {
 	editRepoError   error
 }
 
+func (gc NephioGiteaClientMock) IsInitialized() bool {
+	return true
+}
+
 func (gc NephioGiteaClientMock) Get() *gitea.Client {
 	return nil
 }