diff --git a/util/app/discovery/discovery.go b/util/app/discovery/discovery.go
index 9205acd668c6c..c7d3eabf1788e 100644
--- a/util/app/discovery/discovery.go
+++ b/util/app/discovery/discovery.go
@@ -3,13 +3,12 @@ package discovery
 import (
 	"context"
 	"fmt"
-	securejoin "github.com/cyphar/filepath-securejoin"
 	"os"
 	"path/filepath"
 	"strings"
 
+	securejoin "github.com/cyphar/filepath-securejoin"
 	"github.com/golang/protobuf/ptypes/empty"
-
 	grpc_retry "github.com/grpc-ecosystem/go-grpc-middleware/retry"
 	log "github.com/sirupsen/logrus"
 
diff --git a/util/app/discovery/discovery_test.go b/util/app/discovery/discovery_test.go
index c2eaf6bfdda37..bad68517f2187 100644
--- a/util/app/discovery/discovery_test.go
+++ b/util/app/discovery/discovery_test.go
@@ -2,15 +2,15 @@ package discovery
 
 import (
 	"context"
-	"github.com/argoproj/argo-cd/v2/cmpserver/apiclient"
-	cmpmocks "github.com/argoproj/argo-cd/v2/cmpserver/apiclient/mocks"
-	"github.com/argoproj/argo-cd/v2/util/app/discovery/mocks"
-	"github.com/stretchr/testify/mock"
 	"testing"
 
+	"github.com/argoproj/argo-cd/v2/cmpserver/apiclient"
+	cmpmocks "github.com/argoproj/argo-cd/v2/cmpserver/apiclient/mocks"
 	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v2/util/app/discovery/mocks"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 )