Skip to content

fix: enable api for all users for module #3495

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 2 commits into from
Jun 8, 2023
Merged

fix: enable api for all users for module #3495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
130a43b
enable api for all users
Shivam-nagar23 Jun 8, 2023
cd9ee0f
fix for query break
Shivam-nagar23 Jun 8, 2023
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
8 changes: 4 additions & 4 deletions internal/sql/repository/security/ImageScanResultRepository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,30 +94,30 @@ func (impl ImageScanResultRepositoryImpl) FetchByScanExecutionId(scanExecutionId
Where("image_scan_execution_result.scan_execution_id = ?", id).Select()
*/

err := impl.dbConnection.Model(&models).ColumnExpr("DISTINCT cve_store_name").Column("image_scan_execution_result.*", "CveStore").
err := impl.dbConnection.Model(&models).Column("image_scan_execution_result.*", "CveStore").
Where("image_scan_execution_result.image_scan_execution_history_id = ?", scanExecutionId).
Select()
return models, err
}

func (impl ImageScanResultRepositoryImpl) FetchByScanExecutionIds(ids []int) ([]*ImageScanExecutionResult, error) {
var models []*ImageScanExecutionResult
err := impl.dbConnection.Model(&models).ColumnExpr("DISTINCT cve_store_name").Column("image_scan_execution_result.*", "ImageScanExecutionHistory", "CveStore").
err := impl.dbConnection.Model(&models).Column("image_scan_execution_result.*", "ImageScanExecutionHistory", "CveStore").
Where("image_scan_execution_result.image_scan_execution_history_id in(?)", pg.In(ids)).
Select()
return models, err
}

func (impl ImageScanResultRepositoryImpl) FindByImageDigest(imageDigest string) ([]*ImageScanExecutionResult, error) {
var model []*ImageScanExecutionResult
err := impl.dbConnection.Model(&model).ColumnExpr("DISTINCT cve_store_name").Column("image_scan_execution_result.*", "ImageScanExecutionHistory", "CveStore").
err := impl.dbConnection.Model(&model).Column("image_scan_execution_result.*", "ImageScanExecutionHistory", "CveStore").
Where("image_scan_execution_history.image_hash = ?", imageDigest).Order("image_scan_execution_history.execution_time desc").Select()
return model, err
}

func (impl ImageScanResultRepositoryImpl) FindByImageDigests(digest []string) ([]*ImageScanExecutionResult, error) {
var models []*ImageScanExecutionResult
err := impl.dbConnection.Model(&models).ColumnExpr("DISTINCT cve_store_name").Column("image_scan_execution_result.*", "ImageScanExecutionHistory", "CveStore").
err := impl.dbConnection.Model(&models).Column("image_scan_execution_result.*", "ImageScanExecutionHistory", "CveStore").
Where("image_hash in (?)", pg.In(digest)).Order("execution_time desc").Select()
return models, err
}
Expand Down
3 changes: 0 additions & 3 deletions pkg/module/ModuleService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,9 +435,6 @@ func (impl ModuleServiceImpl) HandleModuleAction(userId int32, moduleName string
}, nil
}
func (impl ModuleServiceImpl) EnableModule(moduleName, version string) (*ActionResponse, error) {
if impl.serverEnvConfig.DevtronInstallationType != serverBean.DevtronInstallationTypeOssHelm {
return nil, errors.New("module Enabling is not allowed")
}

// get module by name
module, err := impl.moduleRepository.FindOne(moduleName)
Expand Down