Use dependency injection with argocd client

commercetools · Dec 4, 2024 · b162746 · b162746
1 parent bb890c1
commit b162746
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/internal/pkg/argocd/argocd.go b/internal/pkg/argocd/argocd.go
@@ -172,7 +172,7 @@ func getEnv(key, fallback string) string {
 	return fallback
 }
 
-func createArgoCdClients() (ac argoCdClients, err error) {
+func CreateArgoCdClients() (ac argoCdClients, err error) {
 	plaintext, _ := strconv.ParseBool(getEnv("ARGOCD_PLAINTEXT", "false"))
 	insecure, _ := strconv.ParseBool(getEnv("ARGOCD_INSECURE", "false"))
 
@@ -320,7 +320,7 @@ func findArgocdApp(ctx context.Context, componentPath string, repo string, appCl
 func SetArgoCDAppRevision(ctx context.Context, componentPath string, revision string, repo string, useSHALabelForArgoDicovery bool) error {
 	var foundApp *argoappv1.Application
 	var err error
-	ac, err := createArgoCdClients()
+	ac, err := CreateArgoCdClients()
 	if err != nil {
 		return fmt.Errorf("Error creating ArgoCD clients: %w", err)
 	}

diff --git a/internal/pkg/argocd/argocd_test.go b/internal/pkg/argocd/argocd_test.go
@@ -325,25 +325,17 @@ func TestFetchArgoDiffConcurrently(t *testing.T) {
 	mockCtrl := gomock.NewController(t)
 	defer mockCtrl.Finish()
 
-	argoClients, err := createArgoCdClients()
-	if err != nil {
-		t.Errorf("error creating ArgoCD clients: %v", err)
-	}
-
 	// mock the argoClients
 	mockAppServiceClient := mocks.NewMockApplicationServiceClient(mockCtrl)
 	mockSettingsServiceClient := mocks.NewMockSettingsServiceClient(mockCtrl)
 	mockProjectServiceClient := mocks.NewMockProjectServiceClient(mockCtrl)
 	// fake InitArgoClients
-	InitArgoClients = func() (argoCdClients, error) {
-		argoClients := argoCdClients{
-			app:     mockAppServiceClient,
-			setting: mockSettingsServiceClient,
-			project: mockProjectServiceClient,
-		}
-		return argoClients, nil
-	}
 
+	argoClients := argoCdClients{
+		app:     mockAppServiceClient,
+		setting: mockSettingsServiceClient,
+		project: mockProjectServiceClient,
+	}
 	// slowReply simulates a slow reply from the server
 	slowReply := func(ctx context.Context, in any, opts ...any) {
 		time.Sleep(time.Second)

diff --git a/internal/pkg/githubapi/github.go b/internal/pkg/githubapi/github.go
@@ -224,7 +224,7 @@ func handleChangedPREvent(ctx context.Context, mainGithubClientPair GhClientPair
 				ghPrClientDetails.PrLogger.Debugf("ArgoCD diff disabled for %s\n", componentPath)
 			}
 		}
-		argoClients, err := createArgoCdClients()
+		argoClients, err := argocd.CreateArgoCdClients()
 		if err != nil {
 			return fmt.Errorf("error creating ArgoCD clients: %w", err)
 		}