Skip to content

fix: getting force_security_scan value from devtron-cm #3558

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 23, 2023
Merged

fix: getting force_security_scan value from devtron-cm #3558

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28e27d3
getting force_security_scan value from devtron-cm
gireesh-naidu Jun 23, 2023
8dce28a
condition updated to force enforce or requested enforce
gireesh-naidu Jun 23, 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
38 changes: 16 additions & 22 deletions pkg/pipeline/PipelineBuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,12 @@ type DeploymentServiceTypeConfig struct {
IsInternalUse bool `env:"IS_INTERNAL_USE" envDefault:"false"`
}

type SecurityConfig struct {
//FORCE_SECURITY_SCANNING flag is being maintained in both dashboard and orchestrator CM's
//TODO: rishabh will remove FORCE_SECURITY_SCANNING from dashboard's CM.
ForceSecurityScanning bool `env:"FORCE_SECURITY_SCANNING" envDefault:"false"`
}

func GetDeploymentServiceTypeConfig() (*DeploymentServiceTypeConfig, error) {
cfg := &DeploymentServiceTypeConfig{}
err := env.Parse(cfg)
Expand Down Expand Up @@ -217,6 +223,7 @@ type PipelineBuilderImpl struct {
appGroupService appGroup2.AppGroupService
chartDeploymentService util.ChartDeploymentService
K8sUtil *util.K8sUtil
securityConfig *SecurityConfig
}

func NewPipelineBuilderImpl(logger *zap.SugaredLogger,
Expand Down Expand Up @@ -270,6 +277,12 @@ func NewPipelineBuilderImpl(logger *zap.SugaredLogger,
appGroupService appGroup2.AppGroupService,
chartDeploymentService util.ChartDeploymentService,
K8sUtil *util.K8sUtil) *PipelineBuilderImpl {

securityConfig := &SecurityConfig{}
err := env.Parse(securityConfig)
if err != nil {
logger.Errorw("error in parsing securityConfig,setting ForceSecurityScanning to default value", "defaultValue", securityConfig.ForceSecurityScanning, "err", err)
}
return &PipelineBuilderImpl{
logger: logger,
ciCdPipelineOrchestrator: ciCdPipelineOrchestrator,
Expand Down Expand Up @@ -330,6 +343,7 @@ func NewPipelineBuilderImpl(logger *zap.SugaredLogger,
appGroupService: appGroupService,
chartDeploymentService: chartDeploymentService,
K8sUtil: K8sUtil,
securityConfig: securityConfig,
}
}

Expand Down Expand Up @@ -1423,28 +1437,8 @@ func (impl PipelineBuilderImpl) PatchCiPipeline(request *bean.CiPatchRequest) (c
ciConfig.AppWorkflowId = request.AppWorkflowId
ciConfig.UserId = request.UserId
if request.CiPipeline != nil {
client, err := impl.K8sUtil.GetClientForInCluster()
if err != nil {
impl.logger.Errorw("exception while getting unique client id", "error", err)
return nil, err
}
cm, err := impl.K8sUtil.GetConfigMap(argo.DEVTRONCD_NAMESPACE, DashboardConfigMap, client)
if err != nil {
impl.logger.Errorw("error while getting dashboard-cm", "error", err)
return nil, err
}
if cm == nil {
impl.logger.Errorw("error while getting dashboard-cm", "error", err)
return nil, err
}
datamap := cm.Data
forceScanConfig, err := strconv.ParseBool(datamap[SECURITY_SCANNING])
if err != nil {
forceScanConfig = false
}
if forceScanConfig {
request.CiPipeline.ScanEnabled = true
}
//setting ScanEnabled value from env variable,
request.CiPipeline.ScanEnabled = impl.securityConfig.ForceSecurityScanning
ciConfig.ScanEnabled = request.CiPipeline.ScanEnabled
}
switch request.Action {
Expand Down