Merge branch 'main' into v0.4.27-hotfix

prakarsh-dt · web-flow · commit c1fa369ed37f · 2022-07-22T16:22:48.000+05:30
diff --git a/api/appbean/AppDetail.go b/api/appbean/AppDetail.go
@@ -43,6 +43,7 @@ type DockerBuildConfig struct {
 	GitCheckoutPath        string            `json:"gitCheckoutPath,omitempty" validate:"required"`
 	DockerfileRelativePath string            `json:"dockerfileRelativePath,omitempty" validate:"required"`
 	Args                   map[string]string `json:"args,omitempty"`
+	TargetPlatform         string            `json:"targetPlatform"`
 }
 
 type DeploymentTemplate struct {
diff --git a/api/restHandler/CoreAppRestHandler.go b/api/restHandler/CoreAppRestHandler.go
@@ -497,6 +497,7 @@ func (handler CoreAppRestHandlerImpl) buildDockerConfig(appId int) (*appBean.Doc
 		BuildConfig: &appBean.DockerBuildConfig{
 			Args:                   ciConfig.DockerBuildConfig.Args,
 			DockerfileRelativePath: ciConfig.DockerBuildConfig.DockerfilePath,
+			TargetPlatform:         ciConfig.DockerBuildConfig.TargetPlatform,
 			GitCheckoutPath:        gitMaterial.CheckoutPath,
 		},
 	}
@@ -1256,6 +1257,7 @@ func (handler CoreAppRestHandlerImpl) createDockerConfig(appId int, dockerConfig
 		GitMaterialId:  gitMaterial.Id,
 		DockerfilePath: dockerConfig.BuildConfig.DockerfileRelativePath,
 		Args:           dockerBuildArgs,
+		TargetPlatform: dockerConfig.BuildConfig.TargetPlatform,
 	}
 	createDockerConfigRequest.DockerBuildConfig = dockerBuildConfigRequest
 
diff --git a/internal/sql/repository/pipelineConfig/CiTemplateRepository.go b/internal/sql/repository/pipelineConfig/CiTemplateRepository.go
@@ -33,7 +33,8 @@ type CiTemplate struct {
 	DockerRegistryId  string   `sql:"docker_registry_id"` //foreign key of registry
 	DockerRepository  string   `sql:"docker_repository"`
 	DockerfilePath    string   `sql:"dockerfile_path"`
-	Args              string   `sql:"args"`                //json string format of map[string]string
+	Args              string   `sql:"args"` //json string format of map[string]string
+	TargetPlatform    string   `sql:"target_platform,notnull"`
 	BeforeDockerBuild string   `sql:"before_docker_build"` //json string  format of []*Task
 	AfterDockerBuild  string   `sql:"after_docker_build"`  //json string  format of []*Task
 	TemplateName      string   `sql:"template_name"`
diff --git a/internal/util/ChartService.go b/internal/util/ChartService.go
@@ -264,6 +264,8 @@ func (impl ChartTemplateServiceImpl) pushChartToGitRepo(gitOpsRepoName, referenc
 	}
 
 	dir := filepath.Join(clonedDir, referenceTemplate, version)
+	pushChartToGit := true
+
 	//if chart already exists don't overrides it by reference template
 	if _, err := os.Stat(dir); os.IsNotExist(err) {
 		err = os.MkdirAll(dir, os.ModePerm)
@@ -287,30 +289,37 @@ func (impl ChartTemplateServiceImpl) pushChartToGitRepo(gitOpsRepoName, referenc
 				impl.logger.Errorw("error copying content in auto-healing", "err", err)
 				return err
 			}
+		} else {
+			// chart exists on git, hence not performing first commit
+			pushChartToGit = false
 		}
 	}
 
-	userEmailId, userName := impl.GetUserEmailIdAndNameForGitOpsCommit(userId)
-	commit, err := impl.gitFactory.gitService.CommitAndPushAllChanges(clonedDir, "first commit", userName, userEmailId)
-	if err != nil {
-		impl.logger.Errorw("error in pushing git", "err", err)
-		impl.logger.Warn("re-trying, taking pull and then push again")
-		err = impl.GitPull(clonedDir, repoUrl, gitOpsRepoName)
-		if err != nil {
-			return err
-		}
-		err = dirCopy.Copy(tempReferenceTemplateDir, dir)
-		if err != nil {
-			impl.logger.Errorw("error copying dir", "err", err)
-			return err
-		}
-		commit, err = impl.gitFactory.gitService.CommitAndPushAllChanges(clonedDir, "first commit", userName, userEmailId)
+	// if push needed, then only push
+	if pushChartToGit {
+		userEmailId, userName := impl.GetUserEmailIdAndNameForGitOpsCommit(userId)
+		commit, err := impl.gitFactory.gitService.CommitAndPushAllChanges(clonedDir, "first commit", userName, userEmailId)
 		if err != nil {
 			impl.logger.Errorw("error in pushing git", "err", err)
-			return err
+			impl.logger.Warn("re-trying, taking pull and then push again")
+			err = impl.GitPull(clonedDir, repoUrl, gitOpsRepoName)
+			if err != nil {
+				return err
+			}
+			err = dirCopy.Copy(tempReferenceTemplateDir, dir)
+			if err != nil {
+				impl.logger.Errorw("error copying dir", "err", err)
+				return err
+			}
+			commit, err = impl.gitFactory.gitService.CommitAndPushAllChanges(clonedDir, "first commit", userName, userEmailId)
+			if err != nil {
+				impl.logger.Errorw("error in pushing git", "err", err)
+				return err
+			}
 		}
+		impl.logger.Debugw("template committed", "url", repoUrl, "commit", commit)
 	}
-	impl.logger.Debugw("template committed", "url", repoUrl, "commit", commit)
+
 	defer impl.CleanDir(clonedDir)
 	return nil
 }
diff --git a/pkg/appClone/AppCloneService.go b/pkg/appClone/AppCloneService.go
@@ -276,6 +276,7 @@ func (impl *AppCloneServiceImpl) CreateCiTemplate(oldAppId, newAppId int, userId
 			GitMaterialId:  dockerfileGitMaterial,
 			DockerfilePath: refCiConf.DockerBuildConfig.DockerfilePath,
 			Args:           refCiConf.DockerBuildConfig.Args,
+			TargetPlatform: refCiConf.DockerBuildConfig.TargetPlatform,
 		},
 		DockerRegistryUrl: refCiConf.DockerRegistry,
 		CiTemplateName:    refCiConf.CiTemplateName,
diff --git a/pkg/bean/app.go b/pkg/bean/app.go
@@ -102,6 +102,7 @@ type CiPipeline struct {
 	AppWorkflowId            int                    `json:"appWorkflowId,omitempty"`
 	PreBuildStage            *bean.PipelineStageDto `json:"preBuildStage,omitempty"`
 	PostBuildStage           *bean.PipelineStageDto `json:"postBuildStage,omitempty"`
+	TargetPlatform           string                 `json:"targetPlatform,omitempty"`
 }
 
 type CiPipelineMin struct {
@@ -259,6 +260,7 @@ type DockerBuildConfig struct {
 	GitMaterialId  int               `json:"gitMaterialId,omitempty" validate:"required"`
 	DockerfilePath string            `json:"dockerfileRelativePath,omitempty" validate:"required"`
 	Args           map[string]string `json:"args,omitempty"`
+	TargetPlatform string            `json:"targetPlatform"`
 	//Name Tag DockerfilePath RepoUrl
 }
 
diff --git a/pkg/notifier/NotificationConfigBuilder.go b/pkg/notifier/NotificationConfigBuilder.go
@@ -22,7 +22,6 @@ import (
 	"github.com/devtron-labs/devtron/internal/sql/repository"
 	"github.com/devtron-labs/devtron/util/event"
 	"go.uber.org/zap"
-	"strings"
 	"time"
 )
 
@@ -170,17 +169,7 @@ func (impl NotificationConfigBuilderImpl) buildNotificationSetting(notificationS
 }
 
 func (impl NotificationConfigBuilderImpl) BuildNotificationSettingWithPipeline(teamId *int, envId *int, appId *int, pipelineId *int, pipelineType util.PipelineType, eventTypeId int, viewId int, providers []*Provider) (repository.NotificationSettings, error) {
-
-	for _, provider := range providers {
-		if len(provider.Recipient) > 0 {
-			if strings.Contains(provider.Recipient, "@") {
-				provider.Destination = util.SES
-			} else {
-				provider.Destination = util.Slack
-			}
-		}
-	}
-
+	
 	providersJson, err := json.Marshal(providers)
 	if err != nil {
 		impl.logger.Error(err)
diff --git a/pkg/notifier/NotificationConfigService.go b/pkg/notifier/NotificationConfigService.go
@@ -23,7 +23,6 @@ import (
 	repository3 "github.com/devtron-labs/devtron/pkg/cluster/repository"
 	repository2 "github.com/devtron-labs/devtron/pkg/team"
 	repository4 "github.com/devtron-labs/devtron/pkg/user/repository"
-	"strings"
 	"time"
 
 	"github.com/devtron-labs/devtron/internal/sql/repository"
@@ -368,19 +367,21 @@ func (impl *NotificationConfigServiceImpl) BuildNotificationSettingsResponse(not
 			var slackIds []*int
 			var sesUserIds []int32
 			var smtpUserIds []int32
-			var directRecipients []string
+			var providerConfigs []*ProvidersConfig
 			for _, item := range config.Providers {
-				if item.Destination == util.Slack {
-					slackIds = append(slackIds, &item.ConfigId)
-				} else if item.Destination == util.SES {
-					sesUserIds = append(sesUserIds, int32(item.ConfigId))
-				} else if item.Destination == util.SMTP {
-					smtpUserIds = append(smtpUserIds, int32(item.ConfigId))
+				// if item.ConfigId > 0 that means, user is of user repository, else user email is custom
+				if item.ConfigId > 0 {
+					if item.Destination == util.Slack {
+						slackIds = append(slackIds, &item.ConfigId)
+					} else if item.Destination == util.SES {
+						sesUserIds = append(sesUserIds, int32(item.ConfigId))
+					} else if item.Destination == util.SMTP {
+						smtpUserIds = append(smtpUserIds, int32(item.ConfigId))
+					}
 				} else {
-					directRecipients = append(directRecipients, item.Recipient)
+					providerConfigs = append(providerConfigs, &ProvidersConfig{Dest: string(item.Destination), Recipient: item.Recipient})
 				}
 			}
-			var providerConfigs []*ProvidersConfig
 			if len(slackIds) > 0 {
 				slackConfigs, err := impl.slackRepository.FindByIds(slackIds)
 				if err != nil && err != pg.ErrNoRows {
@@ -412,13 +413,6 @@ func (impl *NotificationConfigServiceImpl) BuildNotificationSettingsResponse(not
 					providerConfigs = append(providerConfigs, &ProvidersConfig{Id: int(item.Id), ConfigName: item.EmailId, Dest: string(util.SMTP)})
 				}
 			}
-			for _, item := range directRecipients {
-				if strings.Contains(item, "https://") {
-					providerConfigs = append(providerConfigs, &ProvidersConfig{Dest: string(util.Slack), Recipient: item})
-				} else {
-					providerConfigs = append(providerConfigs, &ProvidersConfig{Dest: string(util.SES), Recipient: item})
-				}
-			}
 			notificationSettingsResponse.ProvidersConfig = providerConfigs
 		}
 
diff --git a/pkg/pipeline/CiService.go b/pkg/pipeline/CiService.go
@@ -395,6 +395,7 @@ func (impl *CiServiceImpl) buildWfRequestForCiPipeline(pipeline *pipelineConfig.
 		DockerRegistryURL:          pipeline.CiTemplate.DockerRegistry.RegistryURL,
 		DockerRepository:           pipeline.CiTemplate.DockerRepository,
 		DockerBuildArgs:            string(merged),
+		DockerBuildTargetPlatform:  pipeline.CiTemplate.TargetPlatform,
 		DockerFileLocation:         dockerfilePath,
 		DockerUsername:             pipeline.CiTemplate.DockerRegistry.Username,
 		DockerPassword:             pipeline.CiTemplate.DockerRegistry.Password,
diff --git a/pkg/pipeline/PipelineBuilder.go b/pkg/pipeline/PipelineBuilder.go
@@ -398,7 +398,7 @@ func (impl PipelineBuilderImpl) getCiTemplateVariables(appId int) (ciConfig *bea
 		DockerRepository:  template.DockerRepository,
 		DockerRegistry:    template.DockerRegistry.Id,
 		DockerRegistryUrl: regHost,
-		DockerBuildConfig: &bean.DockerBuildConfig{DockerfilePath: template.DockerfilePath, Args: dockerArgs, GitMaterialId: template.GitMaterialId},
+		DockerBuildConfig: &bean.DockerBuildConfig{DockerfilePath: template.DockerfilePath, Args: dockerArgs, GitMaterialId: template.GitMaterialId, TargetPlatform: template.TargetPlatform},
 		Version:           template.Version,
 		CiTemplateName:    template.TemplateName,
 		Materials:         materials,
@@ -618,6 +618,7 @@ func (impl PipelineBuilderImpl) UpdateCiTemplate(updateRequest *bean.CiConfigReq
 		DockerfilePath:    originalCiConf.DockerBuildConfig.DockerfilePath,
 		GitMaterialId:     originalCiConf.DockerBuildConfig.GitMaterialId,
 		Args:              string(argByte),
+		TargetPlatform:    originalCiConf.DockerBuildConfig.TargetPlatform,
 		BeforeDockerBuild: string(beforeByte),
 		AfterDockerBuild:  string(afterByte),
 		Version:           originalCiConf.Version,
@@ -697,6 +698,7 @@ func (impl PipelineBuilderImpl) CreateCiPipeline(createRequest *bean.CiConfigReq
 		GitMaterialId:     createRequest.DockerBuildConfig.GitMaterialId,
 		DockerfilePath:    createRequest.DockerBuildConfig.DockerfilePath,
 		Args:              string(argByte),
+		TargetPlatform:    createRequest.DockerBuildConfig.TargetPlatform,
 		Active:            true,
 		TemplateName:      createRequest.CiTemplateName,
 		Version:           createRequest.Version,
diff --git a/pkg/pipeline/WorkflowService.go b/pkg/pipeline/WorkflowService.go
@@ -70,6 +70,7 @@ type WorkflowRequest struct {
 	DockerConnection           string                   `json:"dockerConnection"`
 	DockerCert                 string                   `json:"dockerCert"`
 	DockerBuildArgs            string                   `json:"dockerBuildArgs"`
+	DockerBuildTargetPlatform  string                   `json:"dockerBuildTargetPlatform"`
 	DockerRepository           string                   `json:"dockerRepository"`
 	DockerFileLocation         string                   `json:"dockerfileLocation"`
 	DockerUsername             string                   `json:"dockerUsername"`
@@ -230,7 +231,7 @@ func (impl *WorkflowServiceImpl) SubmitWorkflow(workflowRequest *WorkflowRequest
 						Name: "ci",
 						Container: &v12.Container{
 							Env:   containerEnvVariables,
-							Image: workflowRequest.CiImage,
+							Image: workflowRequest.CiImage, //TODO need to check whether trigger buildx image or normal image
 							Args:  []string{string(workflowJson)},
 							SecurityContext: &v12.SecurityContext{
 								Privileged: &privileged,
diff --git a/scripts/sql/61_alter_ci_template.down.sql b/scripts/sql/61_alter_ci_template.down.sql
@@ -0,0 +1,2 @@
+ALTER TABLE ci_template
+    DROP COLUMN target_platform;
diff --git a/scripts/sql/61_alter_ci_template.up.sql b/scripts/sql/61_alter_ci_template.up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE ci_template
+    ADD COLUMN target_platform VARCHAR(1000) NOT NULL DEFAULT '';
diff --git a/specs/app_create_api.yaml b/specs/app_create_api.yaml
@@ -323,6 +323,8 @@ components:
           type: string
         dockerfileRelativePath:
           type: string
+        targetPlatform:
+          type: string
         args:
           type: array
           items:

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ type DockerBuildConfig struct {`
`43`	`43`	GitCheckoutPath string `json:"gitCheckoutPath,omitempty" validate:"required"`
`44`	`44`	DockerfileRelativePath string `json:"dockerfileRelativePath,omitempty" validate:"required"`
`45`	`45`	Args map[string]string `json:"args,omitempty"`
	`46`	+ TargetPlatform string `json:"targetPlatform"`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`type DeploymentTemplate struct {`
Original file line number	Diff line number	Diff line change
`@@ -497,6 +497,7 @@ func (handler CoreAppRestHandlerImpl) buildDockerConfig(appId int) (*appBean.Doc`
`497`	`497`	`BuildConfig: &appBean.DockerBuildConfig{`
`498`	`498`	`Args: ciConfig.DockerBuildConfig.Args,`
`499`	`499`	`DockerfileRelativePath: ciConfig.DockerBuildConfig.DockerfilePath,`
	`500`	`+ TargetPlatform: ciConfig.DockerBuildConfig.TargetPlatform,`
`500`	`501`	`GitCheckoutPath: gitMaterial.CheckoutPath,`
`501`	`502`	`},`
`502`	`503`	`}`
`@@ -1256,6 +1257,7 @@ func (handler CoreAppRestHandlerImpl) createDockerConfig(appId int, dockerConfig`
`1256`	`1257`	`GitMaterialId: gitMaterial.Id,`
`1257`	`1258`	`DockerfilePath: dockerConfig.BuildConfig.DockerfileRelativePath,`
`1258`	`1259`	`Args: dockerBuildArgs,`
	`1260`	`+ TargetPlatform: dockerConfig.BuildConfig.TargetPlatform,`
`1259`	`1261`	`}`
`1260`	`1262`	`createDockerConfigRequest.DockerBuildConfig = dockerBuildConfigRequest`
`1261`	`1263`
Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,7 @@ type CiPipeline struct {`
`102`	`102`	AppWorkflowId int `json:"appWorkflowId,omitempty"`
`103`	`103`	PreBuildStage *bean.PipelineStageDto `json:"preBuildStage,omitempty"`
`104`	`104`	PostBuildStage *bean.PipelineStageDto `json:"postBuildStage,omitempty"`
	`105`	+ TargetPlatform string `json:"targetPlatform,omitempty"`
`105`	`106`	`}`
`106`	`107`
`107`	`108`	`type CiPipelineMin struct {`
`@@ -259,6 +260,7 @@ type DockerBuildConfig struct {`
`259`	`260`	GitMaterialId int `json:"gitMaterialId,omitempty" validate:"required"`
`260`	`261`	DockerfilePath string `json:"dockerfileRelativePath,omitempty" validate:"required"`
`261`	`262`	Args map[string]string `json:"args,omitempty"`
	`263`	+ TargetPlatform string `json:"targetPlatform"`
`262`	`264`	`//Name Tag DockerfilePath RepoUrl`
`263`	`265`	`}`
`264`	`266`