Skip to content

Commit 36f77c5

Browse files
code review comments incorporated - error handled
1 parent 7e027c5 commit 36f77c5

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

pkg/module/ModuleCacheService.go

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,10 @@ func NewModuleCacheServiceImpl(logger *zap.SugaredLogger, K8sUtil *k8s.K8sServic
7373
}
7474
if !exists {
7575
// insert cicd module entry
76-
impl.updateModuleToInstalled(ModuleNameCicd)
76+
err = impl.updateModuleToInstalled(ModuleNameCicd)
77+
if err != nil {
78+
return nil, err
79+
}
7780

7881
// if old installation (i.e. project was created more than 1 hour ago then insert rest entries)
7982
teamId := 1
@@ -86,7 +89,10 @@ func NewModuleCacheServiceImpl(logger *zap.SugaredLogger, K8sUtil *k8s.K8sServic
8689
// insert first release components if this was old release and user installed full mode at that time
8790
if time.Now().After(team.CreatedOn.Add(1 * time.Hour)) {
8891
for _, supportedModuleName := range SupportedModuleNamesListFirstReleaseExcludingCicd {
89-
impl.updateModuleToInstalled(supportedModuleName)
92+
err = impl.updateModuleToInstalled(supportedModuleName)
93+
if err != nil {
94+
return nil, err
95+
}
9096
}
9197
}
9298
}
@@ -102,7 +108,7 @@ func NewModuleCacheServiceImpl(logger *zap.SugaredLogger, K8sUtil *k8s.K8sServic
102108
return impl, nil
103109
}
104110

105-
func (impl *ModuleCacheServiceImpl) updateModuleToInstalled(moduleName string) {
111+
func (impl *ModuleCacheServiceImpl) updateModuleToInstalled(moduleName string) error {
106112
module := &moduleRepo.Module{
107113
Name: moduleName,
108114
Version: impl.serverDataStore.CurrentVersion,
@@ -112,8 +118,9 @@ func (impl *ModuleCacheServiceImpl) updateModuleToInstalled(moduleName string) {
112118
err := impl.moduleRepository.Save(module)
113119
if err != nil {
114120
log.Println("Error while saving module.", "moduleName", moduleName, "error", err)
115-
return
121+
return err
116122
}
123+
return nil
117124
}
118125

119126
func (impl *ModuleCacheServiceImpl) buildInformerToListenOnInstallerObject() {

pkg/server/ServerCacheService.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ func NewServerCacheServiceImpl(logger *zap.SugaredLogger, serverEnvConfig *serve
7676
releaseInfo, err := impl.helmAppService.GetValuesYaml(context.Background(), &appIdentifier)
7777
if err != nil {
7878
log.Println("got error in fetching devtron helm release values.", "error", err)
79+
return nil, err
7980
}
8081
currentVersion := gjson.Get(releaseInfo.GetMergedValues(), impl.serverEnvConfig.DevtronVersionIdentifierInHelmValues).String()
8182
if len(currentVersion) == 0 {

0 commit comments

Comments
 (0)