Skip to content

Commit 36398db

Browse files
authored
fix: provider nil fields (#4758)
* fixed provider nil fields * updated wire_gen.go
1 parent 54fa2d9 commit 36398db

File tree

11 files changed

+17
-20
lines changed

11 files changed

+17
-20
lines changed

api/appStore/InstalledAppRestHandler.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ import (
4848
"github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
4949
"github.com/devtron-labs/devtron/pkg/auth/user"
5050
"github.com/devtron-labs/devtron/pkg/cluster"
51-
application2 "github.com/devtron-labs/devtron/pkg/k8s/application"
5251
"github.com/devtron-labs/devtron/util"
5352
"github.com/devtron-labs/devtron/util/argo"
5453
"github.com/devtron-labs/devtron/util/rbac"
@@ -92,7 +91,6 @@ type InstalledAppRestHandlerImpl struct {
9291
argoUserService argo.ArgoUserService
9392
cdApplicationStatusUpdateHandler cron.CdApplicationStatusUpdateHandler
9493
installedAppRepository repository.InstalledAppRepository
95-
K8sApplicationService application2.K8sApplicationService
9694
appCrudOperationService app2.AppCrudOperationService
9795
installedAppDeploymentTypeChangeService deploymentTypeChange.InstalledAppDeploymentTypeChangeService
9896
}

api/appStore/deployment/AppStoreDeploymentRestHandler.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import (
2929
"strings"
3030
"time"
3131

32-
client "github.com/devtron-labs/devtron/api/helm-app"
3332
openapi "github.com/devtron-labs/devtron/api/helm-app/openapiClient"
3433
"github.com/devtron-labs/devtron/api/restHandler/common"
3534
"github.com/devtron-labs/devtron/internal/util"
@@ -69,7 +68,6 @@ type AppStoreDeploymentRestHandlerImpl struct {
6968
appStoreDeploymentServiceC appStoreDeploymentCommon.AppStoreDeploymentCommonService
7069
validator *validator.Validate
7170
helmAppService service2.HelmAppService
72-
helmAppRestHandler client.HelmAppRestHandler
7371
argoUserService argo.ArgoUserService
7472
attributesService attributes.AttributesService
7573
}

api/router/TelemetryRouter.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ type TelemetryRouterImpl struct {
3434

3535
func NewTelemetryRouterImpl(logger *zap.SugaredLogger, handler restHandler.TelemetryRestHandler) *TelemetryRouterImpl {
3636
router := &TelemetryRouterImpl{
37+
logger: logger,
3738
handler: handler,
3839
}
3940
return router

client/cron/CdApplicationStatusUpdateHandler.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ type CdApplicationStatusUpdateHandlerImpl struct {
4545
appService app.AppService
4646
workflowDagExecutor dag.WorkflowDagExecutor
4747
installedAppService EAMode.InstalledAppDBService
48-
CdHandler pipeline.CdHandler
4948
AppStatusConfig *app.AppServiceConfig
5049
pubsubClient *pubsub.PubSubClientServiceImpl
5150
pipelineStatusTimelineRepository pipelineConfig.PipelineStatusTimelineRepository

cmd/external-app/wire_gen.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/auth/sso/SSOLoginRepository.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,12 @@ type SSOLoginRepositoryImpl struct {
4444
Logger *zap.SugaredLogger
4545
}
4646

47-
func NewSSOLoginRepositoryImpl(dbConnection *pg.DB) *SSOLoginRepositoryImpl {
48-
return &SSOLoginRepositoryImpl{dbConnection: dbConnection}
47+
func NewSSOLoginRepositoryImpl(dbConnection *pg.DB,
48+
logger *zap.SugaredLogger) *SSOLoginRepositoryImpl {
49+
return &SSOLoginRepositoryImpl{
50+
dbConnection: dbConnection,
51+
Logger: logger,
52+
}
4953
}
5054

5155
type SSOLoginModel struct {

pkg/cluster/ClusterServiceExtended.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ type ClusterServiceImplExtended struct {
3030
grafanaClient grafana.GrafanaClient
3131
installedAppRepository repository2.InstalledAppRepository
3232
clusterServiceCD cluster2.ServiceClient
33-
K8sInformerFactory informer.K8sInformerFactory
3433
gitOpsConfigReadService config.GitOpsConfigReadService
3534
*ClusterServiceImpl
3635
}

pkg/deployment/trigger/devtronApps/TriggerService.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,12 @@ type TriggerServiceImpl struct {
114114
userService user.UserService
115115
gitSensorGrpcClient gitSensorClient.Client
116116
config *types.CdConfig
117-
appRepository appRepository.AppRepository
118117
helmAppService client2.HelmAppService
119118

120119
enforcerUtil rbac.EnforcerUtil
121120
helmAppClient gRPC.HelmAppClient //TODO refactoring: use helm app service instead
122121

122+
appRepository appRepository.AppRepository
123123
scanResultRepository security.ImageScanResultRepository
124124
cvePolicyRepository security.CvePolicyRepository
125125
ciPipelineMaterialRepository pipelineConfig.CiPipelineMaterialRepository
@@ -170,6 +170,7 @@ func NewTriggerServiceImpl(logger *zap.SugaredLogger, cdWorkflowCommonService cd
170170
eventFactory client.EventFactory,
171171
eventClient client.EventClient,
172172
globalEnvVariables *util3.GlobalEnvVariables,
173+
appRepository appRepository.AppRepository,
173174
scanResultRepository security.ImageScanResultRepository,
174175
cvePolicyRepository security.CvePolicyRepository,
175176
ciPipelineMaterialRepository pipelineConfig.CiPipelineMaterialRepository,
@@ -220,6 +221,7 @@ func NewTriggerServiceImpl(logger *zap.SugaredLogger, cdWorkflowCommonService cd
220221
eventClient: eventClient,
221222
globalEnvVariables: globalEnvVariables,
222223
helmAppClient: helmAppClient,
224+
appRepository: appRepository,
223225
scanResultRepository: scanResultRepository,
224226
cvePolicyRepository: cvePolicyRepository,
225227
ciPipelineMaterialRepository: ciPipelineMaterialRepository,

pkg/pipeline/CiService.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ type CiServiceImpl struct {
6969
workflowService WorkflowService
7070
ciPipelineMaterialRepository pipelineConfig.CiPipelineMaterialRepository
7171
ciWorkflowRepository pipelineConfig.CiWorkflowRepository
72-
ciConfig *types.CiConfig
7372
eventClient client.EventClient
7473
eventFactory client.EventFactory
7574
mergeUtil *util.MergeUtil

util/rbac/EnforcerUtilHelm.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,20 @@ type EnforcerUtilHelmImpl struct {
2121
clusterRepository repository.ClusterRepository
2222
teamRepository team.TeamRepository
2323
appRepository app.AppRepository
24-
environmentRepository repository.EnvironmentRepository
2524
InstalledAppRepository repository2.InstalledAppRepository
2625
}
2726

2827
func NewEnforcerUtilHelmImpl(logger *zap.SugaredLogger,
2928
clusterRepository repository.ClusterRepository,
3029
teamRepository team.TeamRepository,
3130
appRepository app.AppRepository,
32-
environmentRepository repository.EnvironmentRepository,
3331
installedAppRepository repository2.InstalledAppRepository,
3432
) *EnforcerUtilHelmImpl {
3533
return &EnforcerUtilHelmImpl{
3634
logger: logger,
3735
clusterRepository: clusterRepository,
3836
teamRepository: teamRepository,
3937
appRepository: appRepository,
40-
environmentRepository: environmentRepository,
4138
InstalledAppRepository: installedAppRepository,
4239
}
4340
}

0 commit comments

Comments
 (0)