@@ -21,6 +21,7 @@ import (
2121 "fmt"
2222 "github.com/argoproj/argo-cd/v2/pkg/apiclient/account"
2323 "github.com/argoproj/argo-cd/v2/util/settings"
24+ "github.com/devtron-labs/common-lib/async"
2425 "github.com/devtron-labs/common-lib/utils/k8s"
2526 "github.com/devtron-labs/devtron/client/argocdServer/bean"
2627 config2 "github.com/devtron-labs/devtron/client/argocdServer/config"
@@ -81,6 +82,7 @@ type ArgoCDConnectionManagerImpl struct {
8182 gitOpsConfigReadService config.GitOpsConfigReadService
8283 runTimeConfig * k8s.RuntimeConfig
8384 argoCDConfigGetter config2.ArgoCDConfigGetter
85+ asyncRunnable * async.Runnable
8486}
8587
8688func NewArgoCDConnectionManagerImpl (Logger * zap.SugaredLogger ,
@@ -92,7 +94,8 @@ func NewArgoCDConnectionManagerImpl(Logger *zap.SugaredLogger,
9294 versionService version.VersionService ,
9395 gitOpsConfigReadService config.GitOpsConfigReadService ,
9496 runTimeConfig * k8s.RuntimeConfig ,
95- argoCDConfigGetter config2.ArgoCDConfigGetter ) (* ArgoCDConnectionManagerImpl , error ) {
97+ argoCDConfigGetter config2.ArgoCDConfigGetter ,
98+ asyncRunnable * async.Runnable ) (* ArgoCDConnectionManagerImpl , error ) {
9699 argoUserServiceImpl := & ArgoCDConnectionManagerImpl {
97100 logger : Logger ,
98101 settingsManager : settingsManager ,
@@ -105,13 +108,17 @@ func NewArgoCDConnectionManagerImpl(Logger *zap.SugaredLogger,
105108 gitOpsConfigReadService : gitOpsConfigReadService ,
106109 runTimeConfig : runTimeConfig ,
107110 argoCDConfigGetter : argoCDConfigGetter ,
111+ asyncRunnable : asyncRunnable ,
108112 }
109113 if ! runTimeConfig .LocalDevMode {
110114 grpcConfig , err := argoCDConfigGetter .GetGRPCConfig ()
111115 if err != nil {
112116 Logger .Errorw ("error in GetAllGRPCConfigs" , "error" , err )
113117 }
114- go argoUserServiceImpl .ValidateGitOpsAndGetOrUpdateArgoCdUserDetail (grpcConfig )
118+ runnableFunc := func () {
119+ argoUserServiceImpl .ValidateGitOpsAndGetOrUpdateArgoCdUserDetail (grpcConfig )
120+ }
121+ asyncRunnable .Execute (runnableFunc )
115122 }
116123 return argoUserServiceImpl , nil
117124}
0 commit comments