fix: Build context backward compatability (#3408)

* backward compatibility added for build context

* rename

* remove required tag on bool value

* remove not null constraint

* fix

* test commit

* changed the root context column to ci_build_config table

* made the column nullable

* column name length constraint fix

* sql script fix

* removed commented lines

* comments added

Author: gireesh-naidu

internal/sql/repository/pipelineConfig/CiBuildConfigRepository.go

@@ -12,6 +12,7 @@ type CiBuildConfig struct {
 	Type                 string   `sql:"type"`
 	CiTemplateId         int      `sql:"ci_template_id"`
 	CiTemplateOverrideId int      `sql:"ci_template_override_id"`
+	UseRootContext       *bool    `sql:"use_root_context"`
 	BuildMetadata        string   `sql:"build_metadata"`
 	sql.AuditLog
 }

pkg/pipeline/CiService.go

@@ -445,6 +445,10 @@ func (impl *CiServiceImpl) buildWfRequestForCiPipeline(pipeline *pipelineConfig.
 	if buildContextCheckoutPath == "" {
 		buildContextCheckoutPath = checkoutPath
 	}
+	if ciBuildConfigBean.UseRootBuildContext {
+		//use root build context i.e '.'
+		buildContextCheckoutPath = "."
+	}
 	if ciBuildConfigBean.CiBuildType == bean2.SELF_DOCKERFILE_BUILD_TYPE || ciBuildConfigBean.CiBuildType == bean2.MANAGED_DOCKERFILE_BUILD_TYPE {
 		ciBuildConfigBean.DockerBuildConfig.BuildContext = filepath.Join(buildContextCheckoutPath, ciBuildConfigBean.DockerBuildConfig.BuildContext)
 		dockerBuildConfig := ciBuildConfigBean.DockerBuildConfig

pkg/pipeline/bean/CiBuildConfig.go

@@ -20,6 +20,7 @@ type CiBuildConfigBean struct {
 	Id                        int                `json:"id"`
 	GitMaterialId             int                `json:"gitMaterialId,omitempty" validate:"required"`
 	BuildContextGitMaterialId int                `json:"buildContextGitMaterialId,omitempty" validate:"required"`
+	UseRootBuildContext       bool               `json:"useRootBuildContext"`
 	CiBuildType               CiBuildType        `json:"ciBuildType"`
 	DockerBuildConfig         *DockerBuildConfig `json:"dockerBuildConfig,omitempty"`
 	BuildPackConfig           *BuildPackConfig   `json:"buildPackConfig"`
@@ -68,6 +69,7 @@ func ConvertBuildConfigBeanToDbEntity(templateId int, overrideTemplateId int, ci
 		CiTemplateOverrideId: overrideTemplateId,
 		BuildMetadata:        buildMetadata,
 		AuditLog:             sql.AuditLog{UpdatedOn: time.Now(), UpdatedBy: userId},
+		UseRootContext:       &ciBuildConfigBean.UseRootBuildContext,
 	}
 	return ciBuildConfigEntity, nil
 }
@@ -91,11 +93,17 @@ func ConvertDbBuildConfigToBean(dbBuildConfig *pipelineConfig.CiBuildConfig) (*C
 			return nil, err
 		}
 	}
+	useRootBuildContext := false
+	//dbBuildConfig.UseRootContext will be nil if the entry in db never updated before
+	if dbBuildConfig.UseRootContext == nil || *(dbBuildConfig.UseRootContext) {
+		useRootBuildContext = true
+	}
 	ciBuildConfigBean := &CiBuildConfigBean{
-		Id:                dbBuildConfig.Id,
-		CiBuildType:       ciBuildType,
-		BuildPackConfig:   buildPackConfig,
-		DockerBuildConfig: dockerBuildConfig,
+		Id:                  dbBuildConfig.Id,
+		CiBuildType:         ciBuildType,
+		BuildPackConfig:     buildPackConfig,
+		DockerBuildConfig:   dockerBuildConfig,
+		UseRootBuildContext: useRootBuildContext,
 	}
 	return ciBuildConfigBean, nil
 }
@@ -131,6 +139,7 @@ func OverrideCiBuildConfig(dockerfilePath string, oldArgs string, ciLevelArgs st
 			return nil, err
 		}
 	}
+	//no entry found in ci_build_config table, construct with requested data
 	if ciBuildConfigBean == nil {
 		dockerArgs := mergeMap(oldDockerArgs, ciLevelDockerArgs)
 		ciBuildConfigBean = &CiBuildConfigBean{
@@ -142,6 +151,8 @@ func OverrideCiBuildConfig(dockerfilePath string, oldArgs string, ciLevelArgs st
 				DockerBuildOptions: dockerBuildOptionsMap,
 				BuildContext:       "",
 			},
+			//setting true as default
+			UseRootBuildContext: true,
 		}
 	} else if ciBuildConfigBean.CiBuildType == SELF_DOCKERFILE_BUILD_TYPE || ciBuildConfigBean.CiBuildType == MANAGED_DOCKERFILE_BUILD_TYPE {
 		dockerBuildConfig := ciBuildConfigBean.DockerBuildConfig

scripts/sql/143_alter_build_context.down.sql

@@ -0,0 +1 @@
+ALTER TABLE ci_build_config DROP COLUMN IF EXISTS use_root_context;

scripts/sql/143_alter_build_context.up.sql

@@ -0,0 +1 @@
+ALTER TABLE ci_build_config ADD COLUMN IF NOT EXISTS "use_root_context" bool;