Skip to content

Commit ded2c48

Browse files
authored
chore: Argo common client (#6266)
* common client implementation * ea wire gix * removing imports * fixing comment * review changes
1 parent 376206d commit ded2c48

39 files changed

+1143
-773
lines changed

Wire.go

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,10 @@ import (
7979
"github.com/devtron-labs/devtron/cel"
8080
"github.com/devtron-labs/devtron/client/argocdServer"
8181
"github.com/devtron-labs/devtron/client/argocdServer/application"
82+
"github.com/devtron-labs/devtron/client/argocdServer/bean"
8283
"github.com/devtron-labs/devtron/client/argocdServer/certificate"
8384
cluster2 "github.com/devtron-labs/devtron/client/argocdServer/cluster"
85+
"github.com/devtron-labs/devtron/client/argocdServer/config"
8486
"github.com/devtron-labs/devtron/client/argocdServer/connection"
8587
"github.com/devtron-labs/devtron/client/argocdServer/repoCredsK8sClient"
8688
repocreds "github.com/devtron-labs/devtron/client/argocdServer/repocreds"
@@ -229,7 +231,7 @@ func InitializeApp() (*App, error) {
229231
connection.SettingsManager,
230232
// auth.GetConfigForDevtronApps,
231233

232-
connection.GetConfig,
234+
bean.GetConfig,
233235
wire.Bind(new(session2.ServiceClient), new(*middleware.LoginService)),
234236

235237
sse.NewSSE,
@@ -926,6 +928,7 @@ func InitializeApp() (*App, error) {
926928
wire.Bind(new(resourceQualifiers.QualifierMappingService), new(*resourceQualifiers.QualifierMappingServiceImpl)),
927929

928930
argocdServer.NewArgoClientWrapperServiceImpl,
931+
argocdServer.NewArgoClientWrapperServiceEAImpl,
929932
wire.Bind(new(argocdServer.ArgoClientWrapperService), new(*argocdServer.ArgoClientWrapperServiceImpl)),
930933

931934
pipeline.NewPluginInputVariableParserImpl,
@@ -937,7 +940,7 @@ func InitializeApp() (*App, error) {
937940
wire.Bind(new(imageDigestPolicy.ImageDigestPolicyService), new(*imageDigestPolicy.ImageDigestPolicyServiceImpl)),
938941

939942
certificate.NewServiceClientImpl,
940-
wire.Bind(new(certificate.Client), new(*certificate.ServiceClientImpl)),
943+
wire.Bind(new(certificate.ServiceClient), new(*certificate.ServiceClientImpl)),
941944

942945
appStoreRestHandler.FullModeWireSet,
943946

@@ -950,14 +953,17 @@ func InitializeApp() (*App, error) {
950953
common.NewDeploymentConfigServiceImpl,
951954
wire.Bind(new(common.DeploymentConfigService), new(*common.DeploymentConfigServiceImpl)),
952955

953-
repoCredsK8sClient.NewRepositorySecret,
954-
wire.Bind(new(repoCredsK8sClient.RepositoryCreds), new(*repoCredsK8sClient.RepositorySecretImpl)),
956+
repoCredsK8sClient.NewRepositoryCredsK8sClientImpl,
957+
wire.Bind(new(repoCredsK8sClient.RepositoryCredsK8sClient), new(*repoCredsK8sClient.RepositoryCredsK8sClientImpl)),
955958

956959
repocreds.NewServiceClientImpl,
957960
wire.Bind(new(repocreds.ServiceClient), new(*repocreds.ServiceClientImpl)),
958961

959962
dbMigration.NewDbMigrationServiceImpl,
960963
wire.Bind(new(dbMigration.DbMigration), new(*dbMigration.DbMigrationServiceImpl)),
964+
965+
config.NewArgoCDConfigGetter,
966+
wire.Bind(new(config.ArgoCDConfigGetter), new(*config.ArgoCDConfigGetterImpl)),
961967
)
962968
return &App{}, nil
963969
}

api/appStore/InstalledAppRestHandler.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import (
3737
"time"
3838

3939
"github.com/devtron-labs/devtron/api/restHandler/common"
40-
"github.com/devtron-labs/devtron/client/argocdServer/application"
4140
"github.com/devtron-labs/devtron/client/cron"
4241
"github.com/devtron-labs/devtron/internal/constants"
4342
"github.com/devtron-labs/devtron/internal/middleware"
@@ -84,7 +83,6 @@ type InstalledAppRestHandlerImpl struct {
8483
chartGroupService chartGroup.ChartGroupService
8584
validator *validator.Validate
8685
clusterService cluster.ClusterService
87-
acdServiceClient application.ServiceClient
8886
appStoreDeploymentService service.AppStoreDeploymentService
8987
appStoreDeploymentDBService service.AppStoreDeploymentDBService
9088
helmAppClient client.HelmAppClient
@@ -100,7 +98,7 @@ func NewInstalledAppRestHandlerImpl(Logger *zap.SugaredLogger, userAuthService u
10098
installedAppService FullMode.InstalledAppDBExtendedService,
10199
installedAppResourceService resource.InstalledAppResourceService,
102100
chartGroupService chartGroup.ChartGroupService, validator *validator.Validate, clusterService cluster.ClusterService,
103-
acdServiceClient application.ServiceClient, appStoreDeploymentService service.AppStoreDeploymentService,
101+
appStoreDeploymentService service.AppStoreDeploymentService,
104102
appStoreDeploymentDBService service.AppStoreDeploymentDBService,
105103
helmAppClient client.HelmAppClient,
106104

@@ -120,7 +118,6 @@ func NewInstalledAppRestHandlerImpl(Logger *zap.SugaredLogger, userAuthService u
120118
chartGroupService: chartGroupService,
121119
validator: validator,
122120
clusterService: clusterService,
123-
acdServiceClient: acdServiceClient,
124121
appStoreDeploymentService: appStoreDeploymentService,
125122
appStoreDeploymentDBService: appStoreDeploymentDBService,
126123
helmAppClient: helmAppClient,

api/restHandler/BulkUpdateRestHandler.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727
"strings"
2828

2929
"github.com/devtron-labs/devtron/api/restHandler/common"
30-
"github.com/devtron-labs/devtron/client/argocdServer/application"
3130
"github.com/devtron-labs/devtron/client/gitSensor"
3231
"github.com/devtron-labs/devtron/internal/sql/repository/helper"
3332
"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
@@ -65,7 +64,6 @@ type BulkUpdateRestHandlerImpl struct {
6564
bulkUpdateService bulkAction.BulkUpdateService
6665
chartService chart.ChartService
6766
propertiesConfigService pipeline.PropertiesConfigService
68-
application application.ServiceClient
6967
userAuthService user.UserService
7068
validator *validator.Validate
7169
teamService team.TeamService
@@ -86,7 +84,6 @@ func NewBulkUpdateRestHandlerImpl(pipelineBuilder pipeline.PipelineBuilder, logg
8684
bulkUpdateService bulkAction.BulkUpdateService,
8785
chartService chart.ChartService,
8886
propertiesConfigService pipeline.PropertiesConfigService,
89-
application application.ServiceClient,
9087
userAuthService user.UserService,
9188
teamService team.TeamService,
9289
enforcer casbin.Enforcer,
@@ -107,7 +104,6 @@ func NewBulkUpdateRestHandlerImpl(pipelineBuilder pipeline.PipelineBuilder, logg
107104
bulkUpdateService: bulkUpdateService,
108105
chartService: chartService,
109106
propertiesConfigService: propertiesConfigService,
110-
application: application,
111107
userAuthService: userAuthService,
112108
validator: validator,
113109
teamService: teamService,

0 commit comments

Comments
 (0)