fix: Build context disable (#3405)

* build-ctx-disable

* build-ctx-disable with env variable

* review changes

Author: gireesh-naidu

pkg/appClone/AppCloneService.go

@@ -780,13 +780,25 @@ func (impl *AppCloneServiceImpl) CreateCiPipeline(req *cloneCiPipelineRequest) (
 				templateOverride := templateOverrideBean.CiTemplateOverride
 				ciBuildConfig := templateOverrideBean.CiBuildConfig
 				//getting new git material for this app
-				gitMaterial, err := impl.materialRepository.FindByAppIdAndCheckoutPath(req.appId, templateOverride.GitMaterial.CheckoutPath)
-				if err != nil {
-					impl.logger.Errorw("error in getting git material by appId and checkoutPath", "err", err, "appid", req.refAppId, "checkoutPath", templateOverride.GitMaterial.CheckoutPath)
-					return nil, err
+				//gitMaterial, err := impl.materialRepository.FindByAppIdAndCheckoutPath(req.appId, templateOverride.GitMaterial.CheckoutPath)
+				if len(req.gitMaterialMapping) == 0 {
+					impl.logger.Errorw("no git materials found for the app", "appId", req.appId)
+					return nil, fmt.Errorf("no git materials found for the app, %d", req.appId)
+				}
+				gitMaterialId := req.gitMaterialMapping[ciBuildConfig.GitMaterialId]
+				buildContextGitMaterialId := req.gitMaterialMapping[ciBuildConfig.BuildContextGitMaterialId]
+				if gitMaterialId == 0 {
+					for _, id := range req.gitMaterialMapping {
+						gitMaterialId = id
+						break
+					}
+				}
+				if buildContextGitMaterialId == 0 {
+					buildContextGitMaterialId = gitMaterialId
 				}
-				ciBuildConfig.GitMaterialId = gitMaterial.Id
-				templateOverride.GitMaterialId = gitMaterial.Id
+				ciBuildConfig.GitMaterialId = gitMaterialId
+				ciBuildConfig.BuildContextGitMaterialId = buildContextGitMaterialId
+				templateOverride.GitMaterialId = gitMaterialId
 				ciBuildConfig.Id = 0
 				ciPatchReq.CiPipeline.DockerConfigOverride = bean.DockerConfigOverride{
 					DockerRegistry:   templateOverride.DockerRegistryId,

pkg/pipeline/CiConfig.go

@@ -86,6 +86,7 @@ type CiConfig struct {
 	BaseLogLocationPath              string                       `env:"BASE_LOG_LOCATION_PATH" envDefault:"/home/devtron/"`
 	ClusterConfig                    *rest.Config
 	NodeLabel                        map[string]string
+	EnableBuildContext               bool `env:"ENABLE_BUILD_CONTEXT" envDefault:"false"`
 }
 
 type CiVolumeMount struct {

pkg/pipeline/CiService.go

@@ -483,6 +483,7 @@ func (impl *CiServiceImpl) buildWfRequestForCiPipeline(pipeline *pipelineConfig.
 		IgnoreDockerCachePull:      impl.ciConfig.IgnoreDockerCacheForCI,
 		CacheInvalidate:            trigger.InvalidateCache,
 		ExtraEnvironmentVariables:  trigger.ExtraEnvironmentVariables,
+		EnableBuildContext:         impl.ciConfig.EnableBuildContext,
 	}
 	if dockerRegistry != nil {
 

pkg/pipeline/WorkflowService.go

@@ -117,6 +117,7 @@ type WorkflowRequest struct {
 	CacheInvalidate            bool                              `json:"cacheInvalidate"`
 	IsPvcMounted               bool                              `json:"IsPvcMounted"`
 	ExtraEnvironmentVariables  map[string]string                 `json:"extraEnvironmentVariables"`
+	EnableBuildContext         bool                              `json:"enableBuildContext"`
 }
 
 const (