From 399c6b88c4cdd6d42352a7f00a4a430497ad61b3 Mon Sep 17 00:00:00 2001 From: ShashwatDadhich Date: Tue, 5 Dec 2023 15:25:24 +0530 Subject: [PATCH 1/4] fix --- internal/sql/repository/security/CveStoreRepository.go | 2 +- pkg/security/ImageScanService.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/sql/repository/security/CveStoreRepository.go b/internal/sql/repository/security/CveStoreRepository.go index e990346604..cb204afa4f 100644 --- a/internal/sql/repository/security/CveStoreRepository.go +++ b/internal/sql/repository/security/CveStoreRepository.go @@ -51,7 +51,7 @@ type VulnerabilityExposure struct { AppId int `json:"appId"` EnvId int `json:"envId"` //ClusterId int `json:"clusterId"` - AppStore bool `json:"appStore"` + AppType bool `json:"appType"` Blocked bool `json:"blocked"` PipelineEnvId int `json:"-"` ChartEnvId int `json:"-"` diff --git a/pkg/security/ImageScanService.go b/pkg/security/ImageScanService.go index 68433fb646..60b60c6205 100644 --- a/pkg/security/ImageScanService.go +++ b/pkg/security/ImageScanService.go @@ -581,7 +581,7 @@ func (impl ImageScanServiceImpl) VulnerabilityExposure(request *security.Vulnera cveStores = append(cveStores, cveStore) for _, item := range vulnerabilityExposureList { envId := 0 - if item.AppStore { + if item.AppType { envId = item.ChartEnvId } else { envId = item.PipelineEnvId @@ -589,7 +589,7 @@ func (impl ImageScanServiceImpl) VulnerabilityExposure(request *security.Vulnera env := envMap[envId] item.EnvId = envId item.EnvName = env.Environment - blockCveList, err := impl.policyService.GetBlockedCVEList(cveStores, env.ClusterId, envId, item.AppId, item.AppStore) + blockCveList, err := impl.policyService.GetBlockedCVEList(cveStores, env.ClusterId, envId, item.AppId, item.AppType) if err != nil { impl.Logger.Errorw("error while fetching blocked list", "err", err) return nil, err From 39ca449552fbe6d62ecaf259c173cf0100a4f1d1 Mon Sep 17 00:00:00 2001 From: ShashwatDadhich Date: Tue, 5 Dec 2023 15:38:24 +0530 Subject: [PATCH 2/4] fix --- internal/sql/repository/security/CveStoreRepository.go | 2 +- pkg/security/ImageScanService.go | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/internal/sql/repository/security/CveStoreRepository.go b/internal/sql/repository/security/CveStoreRepository.go index cb204afa4f..c9bd9e8e6c 100644 --- a/internal/sql/repository/security/CveStoreRepository.go +++ b/internal/sql/repository/security/CveStoreRepository.go @@ -51,7 +51,7 @@ type VulnerabilityExposure struct { AppId int `json:"appId"` EnvId int `json:"envId"` //ClusterId int `json:"clusterId"` - AppType bool `json:"appType"` + AppType int `json:"appType"` Blocked bool `json:"blocked"` PipelineEnvId int `json:"-"` ChartEnvId int `json:"-"` diff --git a/pkg/security/ImageScanService.go b/pkg/security/ImageScanService.go index 60b60c6205..6faa1138e5 100644 --- a/pkg/security/ImageScanService.go +++ b/pkg/security/ImageScanService.go @@ -581,15 +581,17 @@ func (impl ImageScanServiceImpl) VulnerabilityExposure(request *security.Vulnera cveStores = append(cveStores, cveStore) for _, item := range vulnerabilityExposureList { envId := 0 - if item.AppType { + if item.AppType == 1 { envId = item.ChartEnvId - } else { + } else if item.AppType == 0 { envId = item.PipelineEnvId } env := envMap[envId] item.EnvId = envId item.EnvName = env.Environment - blockCveList, err := impl.policyService.GetBlockedCVEList(cveStores, env.ClusterId, envId, item.AppId, item.AppType) + var appStore bool + appStore = item.AppType == int(helper.ChartStoreApp) + blockCveList, err := impl.policyService.GetBlockedCVEList(cveStores, env.ClusterId, envId, item.AppId, appStore) if err != nil { impl.Logger.Errorw("error while fetching blocked list", "err", err) return nil, err From 25f002800655fc76801b6f5c055b2e446137aaa6 Mon Sep 17 00:00:00 2001 From: ShashwatDadhich Date: Tue, 5 Dec 2023 15:46:49 +0530 Subject: [PATCH 3/4] code review comments incorporated --- internal/sql/repository/security/CveStoreRepository.go | 9 +++++---- pkg/security/ImageScanService.go | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/internal/sql/repository/security/CveStoreRepository.go b/internal/sql/repository/security/CveStoreRepository.go index c9bd9e8e6c..7519c3f6e7 100644 --- a/internal/sql/repository/security/CveStoreRepository.go +++ b/internal/sql/repository/security/CveStoreRepository.go @@ -19,6 +19,7 @@ package security import ( "fmt" + "github.com/devtron-labs/devtron/internal/sql/repository/helper" "github.com/devtron-labs/devtron/pkg/sql" "github.com/go-pg/pg" "go.uber.org/zap" @@ -51,10 +52,10 @@ type VulnerabilityExposure struct { AppId int `json:"appId"` EnvId int `json:"envId"` //ClusterId int `json:"clusterId"` - AppType int `json:"appType"` - Blocked bool `json:"blocked"` - PipelineEnvId int `json:"-"` - ChartEnvId int `json:"-"` + AppType helper.AppType `json:"appType"` + Blocked bool `json:"blocked"` + PipelineEnvId int `json:"-"` + ChartEnvId int `json:"-"` } type VulnerabilityExposureListingResponse struct { diff --git a/pkg/security/ImageScanService.go b/pkg/security/ImageScanService.go index 6faa1138e5..f5127c3d54 100644 --- a/pkg/security/ImageScanService.go +++ b/pkg/security/ImageScanService.go @@ -590,7 +590,7 @@ func (impl ImageScanServiceImpl) VulnerabilityExposure(request *security.Vulnera item.EnvId = envId item.EnvName = env.Environment var appStore bool - appStore = item.AppType == int(helper.ChartStoreApp) + appStore = item.AppType == helper.ChartStoreApp blockCveList, err := impl.policyService.GetBlockedCVEList(cveStores, env.ClusterId, envId, item.AppId, appStore) if err != nil { impl.Logger.Errorw("error while fetching blocked list", "err", err) From dead98a5a9f796dc317c118a64a3cdd878b00f21 Mon Sep 17 00:00:00 2001 From: ShashwatDadhich Date: Tue, 5 Dec 2023 15:49:34 +0530 Subject: [PATCH 4/4] code review comments incorporated --- pkg/security/ImageScanService.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/security/ImageScanService.go b/pkg/security/ImageScanService.go index f5127c3d54..af54c60d89 100644 --- a/pkg/security/ImageScanService.go +++ b/pkg/security/ImageScanService.go @@ -581,9 +581,9 @@ func (impl ImageScanServiceImpl) VulnerabilityExposure(request *security.Vulnera cveStores = append(cveStores, cveStore) for _, item := range vulnerabilityExposureList { envId := 0 - if item.AppType == 1 { + if item.AppType == helper.ChartStoreApp { envId = item.ChartEnvId - } else if item.AppType == 0 { + } else if item.AppType == helper.CustomApp { envId = item.PipelineEnvId } env := envMap[envId]