Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: provider nil fields #4758

Merged
merged 2 commits into from
Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions api/appStore/InstalledAppRestHandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ import (
"github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
"github.com/devtron-labs/devtron/pkg/auth/user"
"github.com/devtron-labs/devtron/pkg/cluster"
application2 "github.com/devtron-labs/devtron/pkg/k8s/application"
"github.com/devtron-labs/devtron/util"
"github.com/devtron-labs/devtron/util/argo"
"github.com/devtron-labs/devtron/util/rbac"
Expand Down Expand Up @@ -92,7 +91,6 @@ type InstalledAppRestHandlerImpl struct {
argoUserService argo.ArgoUserService
cdApplicationStatusUpdateHandler cron.CdApplicationStatusUpdateHandler
installedAppRepository repository.InstalledAppRepository
K8sApplicationService application2.K8sApplicationService
appCrudOperationService app2.AppCrudOperationService
installedAppDeploymentTypeChangeService deploymentTypeChange.InstalledAppDeploymentTypeChangeService
}
Expand Down
2 changes: 0 additions & 2 deletions api/appStore/deployment/AppStoreDeploymentRestHandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (
"strings"
"time"

client "github.com/devtron-labs/devtron/api/helm-app"
openapi "github.com/devtron-labs/devtron/api/helm-app/openapiClient"
"github.com/devtron-labs/devtron/api/restHandler/common"
"github.com/devtron-labs/devtron/internal/util"
Expand Down Expand Up @@ -69,7 +68,6 @@ type AppStoreDeploymentRestHandlerImpl struct {
appStoreDeploymentServiceC appStoreDeploymentCommon.AppStoreDeploymentCommonService
validator *validator.Validate
helmAppService service2.HelmAppService
helmAppRestHandler client.HelmAppRestHandler
argoUserService argo.ArgoUserService
attributesService attributes.AttributesService
}
Expand Down
1 change: 1 addition & 0 deletions api/router/TelemetryRouter.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ type TelemetryRouterImpl struct {

func NewTelemetryRouterImpl(logger *zap.SugaredLogger, handler restHandler.TelemetryRestHandler) *TelemetryRouterImpl {
router := &TelemetryRouterImpl{
logger: logger,
handler: handler,
}
return router
Expand Down
1 change: 0 additions & 1 deletion client/cron/CdApplicationStatusUpdateHandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ type CdApplicationStatusUpdateHandlerImpl struct {
appService app.AppService
workflowDagExecutor dag.WorkflowDagExecutor
installedAppService EAMode.InstalledAppDBService
CdHandler pipeline.CdHandler
AppStatusConfig *app.AppServiceConfig
pubsubClient *pubsub.PubSubClientServiceImpl
pipelineStatusTimelineRepository pipelineConfig.PipelineStatusTimelineRepository
Expand Down
6 changes: 3 additions & 3 deletions cmd/external-app/wire_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions pkg/auth/sso/SSOLoginRepository.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,12 @@ type SSOLoginRepositoryImpl struct {
Logger *zap.SugaredLogger
}

func NewSSOLoginRepositoryImpl(dbConnection *pg.DB) *SSOLoginRepositoryImpl {
return &SSOLoginRepositoryImpl{dbConnection: dbConnection}
func NewSSOLoginRepositoryImpl(dbConnection *pg.DB,
logger *zap.SugaredLogger) *SSOLoginRepositoryImpl {
return &SSOLoginRepositoryImpl{
dbConnection: dbConnection,
Logger: logger,
}
}

type SSOLoginModel struct {
Expand Down
1 change: 0 additions & 1 deletion pkg/cluster/ClusterServiceExtended.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ type ClusterServiceImplExtended struct {
grafanaClient grafana.GrafanaClient
installedAppRepository repository2.InstalledAppRepository
clusterServiceCD cluster2.ServiceClient
K8sInformerFactory informer.K8sInformerFactory
gitOpsConfigReadService config.GitOpsConfigReadService
*ClusterServiceImpl
}
Expand Down
4 changes: 3 additions & 1 deletion pkg/deployment/trigger/devtronApps/TriggerService.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,12 @@ type TriggerServiceImpl struct {
userService user.UserService
gitSensorGrpcClient gitSensorClient.Client
config *types.CdConfig
appRepository appRepository.AppRepository
helmAppService client2.HelmAppService

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

appRepository appRepository.AppRepository
scanResultRepository security.ImageScanResultRepository
cvePolicyRepository security.CvePolicyRepository
ciPipelineMaterialRepository pipelineConfig.CiPipelineMaterialRepository
Expand Down Expand Up @@ -170,6 +170,7 @@ func NewTriggerServiceImpl(logger *zap.SugaredLogger, cdWorkflowCommonService cd
eventFactory client.EventFactory,
eventClient client.EventClient,
globalEnvVariables *util3.GlobalEnvVariables,
appRepository appRepository.AppRepository,
scanResultRepository security.ImageScanResultRepository,
cvePolicyRepository security.CvePolicyRepository,
ciPipelineMaterialRepository pipelineConfig.CiPipelineMaterialRepository,
Expand Down Expand Up @@ -220,6 +221,7 @@ func NewTriggerServiceImpl(logger *zap.SugaredLogger, cdWorkflowCommonService cd
eventClient: eventClient,
globalEnvVariables: globalEnvVariables,
helmAppClient: helmAppClient,
appRepository: appRepository,
scanResultRepository: scanResultRepository,
cvePolicyRepository: cvePolicyRepository,
ciPipelineMaterialRepository: ciPipelineMaterialRepository,
Expand Down
1 change: 0 additions & 1 deletion pkg/pipeline/CiService.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ type CiServiceImpl struct {
workflowService WorkflowService
ciPipelineMaterialRepository pipelineConfig.CiPipelineMaterialRepository
ciWorkflowRepository pipelineConfig.CiWorkflowRepository
ciConfig *types.CiConfig
eventClient client.EventClient
eventFactory client.EventFactory
mergeUtil *util.MergeUtil
Expand Down
3 changes: 0 additions & 3 deletions util/rbac/EnforcerUtilHelm.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,20 @@ type EnforcerUtilHelmImpl struct {
clusterRepository repository.ClusterRepository
teamRepository team.TeamRepository
appRepository app.AppRepository
environmentRepository repository.EnvironmentRepository
InstalledAppRepository repository2.InstalledAppRepository
}

func NewEnforcerUtilHelmImpl(logger *zap.SugaredLogger,
clusterRepository repository.ClusterRepository,
teamRepository team.TeamRepository,
appRepository app.AppRepository,
environmentRepository repository.EnvironmentRepository,
installedAppRepository repository2.InstalledAppRepository,
) *EnforcerUtilHelmImpl {
return &EnforcerUtilHelmImpl{
logger: logger,
clusterRepository: clusterRepository,
teamRepository: teamRepository,
appRepository: appRepository,
environmentRepository: environmentRepository,
InstalledAppRepository: installedAppRepository,
}
}
Expand Down
8 changes: 4 additions & 4 deletions wire_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading