Skip to content

fix: all modules installation fix #6140

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 1 commit into from
Nov 29, 2024
Merged

fix: all modules installation fix #6140

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 0 additions & 25 deletions pkg/module/ModuleService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ func (impl ModuleServiceImpl) handleModuleNotFoundStatus(moduleName string) (Mod
}
moduleMetaDataStr := string(moduleMetaData)
isLegacyModule := gjson.Get(moduleMetaDataStr, "result.isIncludedInLegacyFullPackage").Bool()
baseMinVersionSupported := gjson.Get(moduleMetaDataStr, "result.baseMinVersionSupported").String()
moduleType := gjson.Get(moduleMetaDataStr, "result.moduleType").String()

flagForEnablingState := false
Expand Down Expand Up @@ -260,30 +259,6 @@ func (impl ModuleServiceImpl) handleModuleNotFoundStatus(moduleName string) (Mod
}
}

// if module not enabled in helm for non enterprise-user
if isLegacyModule && moduleName != ModuleNameCicd {
for _, firstReleaseModuleName := range SupportedModuleNamesListFirstReleaseExcludingCicd {
if moduleName != firstReleaseModuleName {
cicdModule, err := impl.moduleRepository.FindOne(ModuleNameCicd)
if err != nil {
if err == pg.ErrNoRows {
return ModuleStatusNotInstalled, moduleType, false, nil
} else {
impl.logger.Errorw("Error in getting cicd module from DB", "err", err)
return ModuleStatusNotInstalled, moduleType, false, err
}
}
cicdVersion := cicdModule.Version
// if cicd was installed and any module/integration comes after that then mark that module installed only if cicd was installed before that module introduction
if len(baseMinVersionSupported) > 0 && cicdVersion < baseMinVersionSupported {
status, err := impl.saveModuleAsInstalled(moduleName, moduleType, flagForEnablingState)
return status, moduleType, false, err
}
break
}
}
}

return ModuleStatusNotInstalled, moduleType, false, nil

}
Expand Down
Loading