nil check for ciBaseBuildConfigBean (#5670)

prkhrkat · web-flow · commit aac8b4d8c411 · 2024-08-12T15:16:08.000+05:30
diff --git a/pkg/pipeline/CiService.go b/pkg/pipeline/CiService.go
@@ -576,7 +576,7 @@ func (impl *CiServiceImpl) buildWfRequestForCiPipeline(pipeline *pipelineConfig.
 		}
 		ciBuildConfigBean = templateOverrideBean.CiBuildConfig
 		// updating args coming from ciBaseBuildConfigEntity because it is not part of Ci override
-		if ciBuildConfigBean != nil && ciBuildConfigBean.DockerBuildConfig != nil {
+		if ciBuildConfigBean != nil && ciBuildConfigBean.DockerBuildConfig != nil && ciBaseBuildConfigBean != nil && ciBaseBuildConfigBean.DockerBuildConfig != nil {
 			ciBuildConfigBean.DockerBuildConfig.Args = ciBaseBuildConfigBean.DockerBuildConfig.Args
 		}
 		templateOverride := templateOverrideBean.CiTemplateOverride

Original file line number	Diff line number	Diff line change
`@@ -576,7 +576,7 @@ func (impl CiServiceImpl) buildWfRequestForCiPipeline(pipeline pipelineConfig.`
`576`	`576`	`}`
`577`	`577`	`ciBuildConfigBean = templateOverrideBean.CiBuildConfig`
`578`	`578`	`// updating args coming from ciBaseBuildConfigEntity because it is not part of Ci override`
`579`		`- if ciBuildConfigBean != nil && ciBuildConfigBean.DockerBuildConfig != nil {`
	`579`	`+ if ciBuildConfigBean != nil && ciBuildConfigBean.DockerBuildConfig != nil && ciBaseBuildConfigBean != nil && ciBaseBuildConfigBean.DockerBuildConfig != nil {`
`580`	`580`	`ciBuildConfigBean.DockerBuildConfig.Args = ciBaseBuildConfigBean.DockerBuildConfig.Args`
`581`	`581`	`}`
`582`	`582`	`templateOverride := templateOverrideBean.CiTemplateOverride`