Skip to content

fix: injected app-serveice dependency into DeployedApplicationEventProcessor service #4875

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Apr 3, 2024
Merged

fix: injected app-serveice dependency into DeployedApplicationEventProcessor service #4875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73dff61
fix: injected app-serveice dependency into DeployedApplicationEventPr…
gireesh-naidu Apr 2, 2024
a9b9f4f
Merge branch 'main' into dependency-nil-fix
gireesh-naidu Apr 3, 2024
2b3545b
Merge branch 'main' into dependency-nil-fix
gireesh-naidu Apr 3, 2024
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
11 changes: 7 additions & 4 deletions pkg/eventProcessor/in/DeployedApplicationEventProcessorService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ type DeployedApplicationEventProcessorImpl struct {
installedAppRepository repository.InstalledAppRepository
}

func NewDeployedApplicationEventProcessorImpl(logger *zap.SugaredLogger, pubSubClient *pubsub.PubSubClientServiceImpl,
func NewDeployedApplicationEventProcessorImpl(logger *zap.SugaredLogger,
pubSubClient *pubsub.PubSubClientServiceImpl,
appService app.AppService,
gitOpsConfigReadService config.GitOpsConfigReadService,
installedAppService FullMode.InstalledAppDBExtendedService,
workflowDagExecutor dag.WorkflowDagExecutor,
Expand All @@ -54,6 +56,7 @@ func NewDeployedApplicationEventProcessorImpl(logger *zap.SugaredLogger, pubSubC
deployedApplicationEventProcessorImpl := &DeployedApplicationEventProcessorImpl{
logger: logger,
pubSubClient: pubSubClient,
appService: appService,
gitOpsConfigReadService: gitOpsConfigReadService,
installedAppService: installedAppService,
workflowDagExecutor: workflowDagExecutor,
Expand Down Expand Up @@ -86,10 +89,10 @@ func (impl *DeployedApplicationEventProcessorImpl) SubscribeArgoAppUpdate() erro
_, err = impl.pipelineRepository.GetArgoPipelineByArgoAppName(app.ObjectMeta.Name)
if err != nil && err == pg.ErrNoRows {
impl.logger.Infow("this app not found in pipeline table looking in installed_apps table", "appName", app.ObjectMeta.Name)
//if not found in pipeline table then search in installed_apps table
// if not found in pipeline table then search in installed_apps table
installedAppModel, err := impl.installedAppRepository.GetInstalledAppByGitOpsAppName(app.ObjectMeta.Name)
if err == pg.ErrNoRows {
//no installed_apps found
// no installed_apps found
impl.logger.Errorw("no installed apps found", "err", err)
return
}
Expand All @@ -98,7 +101,7 @@ func (impl *DeployedApplicationEventProcessorImpl) SubscribeArgoAppUpdate() erro
return
}
if installedAppModel.Id > 0 {
//app found in installed_apps table hence setting flag to true
// app found in installed_apps table hence setting flag to true
isAppStoreApplication = true
} else {
// app neither found in installed_apps nor in pipeline table hence returning
Expand Down
2 changes: 1 addition & 1 deletion wire_gen.go
View file
Open in desktop

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