feat:Poll Images from ECR Container Repository Plugin

Wire.go

@@ -807,6 +807,10 @@ func InitializeApp() (*App, error) {
 		cron.NewCiStatusUpdateCronImpl,
 		wire.Bind(new(cron.CiStatusUpdateCron), new(*cron.CiStatusUpdateCronImpl)),
 
+		cron.GetCiTriggerCronConfig,
+		cron.NewCiTriggerCronImpl,
+		wire.Bind(new(cron.CiTriggerCron), new(*cron.CiTriggerCronImpl)),
+
 		restHandler.NewPipelineStatusTimelineRestHandlerImpl,
 		wire.Bind(new(restHandler.PipelineStatusTimelineRestHandler), new(*restHandler.PipelineStatusTimelineRestHandlerImpl)),
 

api/restHandler/app/BuildPipelineRestHandler.go

@@ -400,7 +400,7 @@ func (handler PipelineConfigRestHandlerImpl) PatchCiPipelines(w http.ResponseWri
 		ciConfigRequest.DockerRegistry = emptyDockerRegistry
 		ciConfigRequest.AppId = patchRequest.AppId
 		ciConfigRequest.CiBuildConfig = &bean1.CiBuildConfigBean{}
-		ciConfigRequest.CiBuildConfig.CiBuildType = "skip-build"
+		ciConfigRequest.CiBuildConfig.CiBuildType = bean1.SKIP_BUILD_TYPE
 		ciConfigRequest.UserId = patchRequest.UserId
 		if patchRequest.CiPipeline == nil || patchRequest.CiPipeline.CiMaterial == nil {
 			handler.Logger.Errorw("Invalid patch ci-pipeline request", "request", patchRequest, "err", "invalid CiPipeline data")
@@ -419,6 +419,22 @@ func (handler PipelineConfigRestHandlerImpl) PatchCiPipelines(w http.ResponseWri
 	if app.AppType == helper.Job {
 		patchRequest.IsJob = true
 	}
+	if patchRequest.CiPipeline.PipelineType == bean.CI_JOB {
+		patchRequest.CiPipeline.IsDockerConfigOverridden = true
+		patchRequest.CiPipeline.DockerConfigOverride = bean.DockerConfigOverride{
+			DockerRegistry:   ciConf.DockerRegistry,
+			DockerRepository: ciConf.DockerRepository,
+			CiBuildConfig: &bean1.CiBuildConfigBean{
+				Id:                        0,
+				GitMaterialId:             patchRequest.CiPipeline.CiMaterial[0].GitMaterialId,
+				BuildContextGitMaterialId: patchRequest.CiPipeline.CiMaterial[0].GitMaterialId,
+				UseRootBuildContext:       false,
+				CiBuildType:               bean1.SKIP_BUILD_TYPE,
+				DockerBuildConfig:         nil,
+				BuildPackConfig:           nil,
+			},
+		}
+	}
 	createResp, err := handler.pipelineBuilder.PatchCiPipeline(&patchRequest)
 	if err != nil {
 		handler.Logger.Errorw("service err, PatchCiPipelines", "err", err, "PatchCiPipelines", patchRequest)

api/router/pubsub/CiEventHandler.go

@@ -20,6 +20,7 @@ package pubsub
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/aws/aws-sdk-go-v2/service/ecr/types"
 	"github.com/caarlos0/env/v6"
 	pubsub "github.com/devtron-labs/common-lib/pubsub-lib"
 	"github.com/devtron-labs/devtron/internal/sql/repository"
@@ -28,6 +29,7 @@ import (
 	bean2 "github.com/devtron-labs/devtron/pkg/pipeline/bean"
 	"github.com/devtron-labs/devtron/util"
 	"go.uber.org/zap"
+	"time"
 )
 
 type CiEventConfig struct {
@@ -53,6 +55,11 @@ type CiEventHandlerImpl struct {
 	ciEventConfig  *CiEventConfig
 }
 
+type ImageDetailsFromCR struct {
+	ImageDetails []types.ImageDetail `json:"imageDetails"`
+	Region       string              `json:"region"`
+}
+
 type CiCompleteEvent struct {
 	CiProjectDetails   []bean2.CiProjectDetails `json:"ciProjectDetails"`
 	DockerImage        string                   `json:"dockerImage" validate:"required,image-validator"`
@@ -67,6 +74,7 @@ type CiCompleteEvent struct {
 	AppName            string                   `json:"appName"`
 	IsArtifactUploaded bool                     `json:"isArtifactUploaded"`
 	FailureReason      string                   `json:"failureReason"`
+	ImageDetailsFromCR *ImageDetailsFromCR      `json:"imageDetailsFromCR"`
 }
 
 func NewCiEventHandlerImpl(logger *zap.SugaredLogger, pubsubClient *pubsub.PubSubClientServiceImpl, webhookService pipeline.WebhookService, ciEventConfig *CiEventConfig) *CiEventHandlerImpl {
@@ -108,10 +116,26 @@ func (impl *CiEventHandlerImpl) Subscribe() error {
 					ciCompleteEvent.PipelineId, "request: ", req, "error: ", err)
 				return
 			}
+		} else if ciCompleteEvent.ImageDetailsFromCR != nil {
+			if len(ciCompleteEvent.ImageDetailsFromCR.ImageDetails) > 0 {
+				detail := util.GetLatestImageAccToImagePushedAt(ciCompleteEvent.ImageDetailsFromCR.ImageDetails)
+				request, err := impl.BuildCIArtifactRequestForImageFromCR(detail, ciCompleteEvent.ImageDetailsFromCR.Region, ciCompleteEvent)
+				if err != nil {
+					impl.logger.Error("Error while creating request for pipelineID", "pipelineId", ciCompleteEvent.PipelineId, "err", err)
+					return
+				}
+				resp, err := impl.webhookService.HandleCiSuccessEvent(ciCompleteEvent.PipelineId, request, detail.ImagePushedAt)
+				if err != nil {
+					impl.logger.Error("Error while sending event for CI success for pipelineID", "pipelineId",
+						ciCompleteEvent.PipelineId, "request", request, "err", err)
+					return
+				}
+				impl.logger.Debug(resp)
+			}
+
 		} else {
 			util.TriggerCIMetrics(ciCompleteEvent.Metrics, impl.ciEventConfig.ExposeCiMetrics, ciCompleteEvent.PipelineName, ciCompleteEvent.AppName)
-
-			resp, err := impl.webhookService.HandleCiSuccessEvent(ciCompleteEvent.PipelineId, req)
+			resp, err := impl.webhookService.HandleCiSuccessEvent(ciCompleteEvent.PipelineId, req, &time.Time{})
 			if err != nil {
 				impl.logger.Error("Error while sending event for CI success for pipelineID: ",
 					ciCompleteEvent.PipelineId, "request: ", req, "error: ", err)
@@ -195,6 +219,22 @@ func (impl *CiEventHandlerImpl) BuildCiArtifactRequest(event CiCompleteEvent) (*
 	return request, nil
 }
 
+func (impl *CiEventHandlerImpl) BuildCIArtifactRequestForImageFromCR(imageDetails types.ImageDetail, region string, event CiCompleteEvent) (*pipeline.CiArtifactWebhookRequest, error) {
+	if event.TriggeredBy == 0 {
+		event.TriggeredBy = 1 // system triggered event
+	}
+	request := &pipeline.CiArtifactWebhookRequest{
+		Image:              util.ExtractEcrImage(*imageDetails.RegistryId, region, *imageDetails.RepositoryName, imageDetails.ImageTags[0]),
+		ImageDigest:        *imageDetails.ImageDigest,
+		DataSource:         event.DataSource,
+		PipelineName:       event.PipelineName,
+		UserId:             event.TriggeredBy,
+		WorkflowId:         event.WorkflowId,
+		IsArtifactUploaded: event.IsArtifactUploaded,
+	}
+	return request, nil
+}
+
 func (impl *CiEventHandlerImpl) BuildCiArtifactRequestForWebhook(event CiCompleteEvent) (*pipeline.CiArtifactWebhookRequest, error) {
 	ciMaterialInfos := make([]repository.CiMaterialInfo, 0)
 	if event.MaterialType == "" {

api/router/router.go

@@ -121,6 +121,7 @@ type MuxRouter struct {
 	appGroupingRouter                  AppGroupingRouter
 	rbacRoleRouter                     user.RbacRoleRouter
 	scopedVariableRouter               ScopedVariableRouter
+	ciTriggerCron                      cron.CiTriggerCron
 }
 
 func NewMuxRouter(logger *zap.SugaredLogger, HelmRouter PipelineTriggerRouter, PipelineConfigRouter PipelineConfigRouter,
@@ -151,7 +152,8 @@ func NewMuxRouter(logger *zap.SugaredLogger, HelmRouter PipelineTriggerRouter, P
 	userTerminalAccessRouter terminal2.UserTerminalAccessRouter,
 	jobRouter JobRouter, ciStatusUpdateCron cron.CiStatusUpdateCron, appGroupingRouter AppGroupingRouter,
 	rbacRoleRouter user.RbacRoleRouter,
-	scopedVariableRouter ScopedVariableRouter) *MuxRouter {
+	scopedVariableRouter ScopedVariableRouter,
+	ciTriggerCron cron.CiTriggerCron) *MuxRouter {
 	r := &MuxRouter{
 		Router:                             mux.NewRouter(),
 		HelmRouter:                         HelmRouter,
@@ -222,6 +224,7 @@ func NewMuxRouter(logger *zap.SugaredLogger, HelmRouter PipelineTriggerRouter, P
 		appGroupingRouter:                  appGroupingRouter,
 		rbacRoleRouter:                     rbacRoleRouter,
 		scopedVariableRouter:               scopedVariableRouter,
+		ciTriggerCron:                      ciTriggerCron,
 	}
 	return r
 }

client/cron/CiTriggerCron.go

@@ -0,0 +1,94 @@
+package cron
+
+import (
+	"fmt"
+	"github.com/caarlos0/env"
+	repository2 "github.com/devtron-labs/devtron/internal/sql/repository"
+	"github.com/devtron-labs/devtron/pkg/bean"
+	"github.com/devtron-labs/devtron/pkg/pipeline"
+	bean2 "github.com/devtron-labs/devtron/pkg/pipeline/bean"
+	"github.com/devtron-labs/devtron/pkg/pipeline/repository"
+	repository3 "github.com/devtron-labs/devtron/pkg/plugin/repository"
+	"github.com/robfig/cron/v3"
+	"go.uber.org/zap"
+)
+
+type CiTriggerCron interface {
+	TriggerCiCron()
+}
+
+type CiTriggerCronImpl struct {
+	logger                  *zap.SugaredLogger
+	cron                    *cron.Cron
+	cfg                     *CiTriggerCronConfig
+	pipelineStageRepository repository.PipelineStageRepository
+	ciHandler               pipeline.CiHandler
+	ciArtifactRepository    repository2.CiArtifactRepository
+	globalPluginRepository  repository3.GlobalPluginRepository
+}
+
+func NewCiTriggerCronImpl(logger *zap.SugaredLogger, cfg *CiTriggerCronConfig, pipelineStageRepository repository.PipelineStageRepository,
+	ciHandler pipeline.CiHandler, ciArtifactRepository repository2.CiArtifactRepository, globalPluginRepository repository3.GlobalPluginRepository) *CiTriggerCronImpl {
+	cron := cron.New(
+		cron.WithChain())
+	cron.Start()
+	impl := &CiTriggerCronImpl{
+		logger:                  logger,
+		cron:                    cron,
+		pipelineStageRepository: pipelineStageRepository,
+		ciHandler:               ciHandler,
+		cfg:                     cfg,
+		ciArtifactRepository:    ciArtifactRepository,
+		globalPluginRepository:  globalPluginRepository,
+	}
+
+	_, err := cron.AddFunc(fmt.Sprintf("@every %dm", cfg.SourceControllerCronTime), impl.TriggerCiCron)
+	if err != nil {
+		logger.Errorw("error while configure cron job for ci workflow status update", "err", err)
+		return impl
+	}
+	return impl
+}
+
+type CiTriggerCronConfig struct {
+	SourceControllerCronTime int    `env:"CI_TRIGGER_CRON_TIME" envDefault:"2"`
+	PluginName               string `env:"PLUGIN_NAME"  envDefault:"Pull images from container repository"`
+}
+
+func GetCiTriggerCronConfig() (*CiTriggerCronConfig, error) {
+	cfg := &CiTriggerCronConfig{}
+	err := env.Parse(cfg)
+	if err != nil {
+		fmt.Println("failed to parse ci trigger cron config: " + err.Error())
+		return nil, err
+	}
+	return cfg, nil
+}
+
+// UpdateCiWorkflowStatusFailedCron this function will execute periodically
+func (impl *CiTriggerCronImpl) TriggerCiCron() {
+	plugin, err := impl.globalPluginRepository.GetPluginByName(impl.cfg.PluginName)
+	if err != nil || len(plugin) == 0 {
+		return
+	}
+
+	ciPipelineIds, err := impl.pipelineStageRepository.GetAllCiPipelineIdsByPluginIdAndStageType(plugin[0].Id, string(repository.PIPELINE_STAGE_TYPE_PRE_CI))
+	if err != nil {
+		return
+	}
+	for _, ciPipelineId := range ciPipelineIds {
+		var ciPipelineMaterials []bean.CiPipelineMaterial
+		ciTriggerRequest := bean.CiTriggerRequest{
+			PipelineId:         ciPipelineId,
+			CiPipelineMaterial: ciPipelineMaterials,
+			TriggeredBy:        1,
+			InvalidateCache:    false,
+			PipelineType:       bean2.CI_JOB,
+		}
+		_, err = impl.ciHandler.HandleCIManual(ciTriggerRequest)
+		if err != nil {
+			return
+		}
+	}
+	return
+}

go.mod

@@ -8,6 +8,7 @@ require (
 	github.com/argoproj/argo-workflows/v3 v3.4.3
 	github.com/argoproj/gitops-engine v0.7.1-0.20221004132320-98ccd3d43fd9
 	github.com/aws/aws-sdk-go v1.44.105
+	github.com/aws/aws-sdk-go-v2/service/ecr v1.20.0
 	github.com/caarlos0/env v3.5.0+incompatible
 	github.com/caarlos0/env/v6 v6.7.2
 	github.com/casbin/casbin v1.9.1
@@ -114,6 +115,7 @@ require (
 	github.com/apparentlymart/go-textseg v1.0.0 // indirect
 	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
 	github.com/argoproj/pkg v0.13.6 // indirect
+	github.com/aws/smithy-go v1.14.2 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bombsimon/logrusr/v2 v2.0.1 // indirect
 	github.com/bradleyfalzon/ghinstallation/v2 v2.0.4 // indirect

go.sum

@@ -178,6 +178,13 @@ github.com/aws/aws-sdk-go v1.44.39/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4
 github.com/aws/aws-sdk-go v1.44.105 h1:UUwoD1PRKIj3ltrDUYTDQj5fOTK3XsnqolLpRTMmSEM=
 github.com/aws/aws-sdk-go v1.44.105/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
 github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
+github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41/go.mod h1:CrObHAuPneJBlfEJ5T3szXOUkLEThaGfvnhTf33buas=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw=
+github.com/aws/aws-sdk-go-v2/service/ecr v1.20.0 h1:Qw8H7V55d2P1d/a9+cLgAcdez4GtP6l30KQAeYqx9vY=
+github.com/aws/aws-sdk-go-v2/service/ecr v1.20.0/go.mod h1:pGwmNL8hN0jpBfKfTbmu+Rl0bJkDhaGl+9PQLrZ4KLo=
+github.com/aws/smithy-go v1.14.2 h1:MJU9hqBGbvWZdApzpvoF2WAIJDbtjK2NDJSiJP7HblQ=
+github.com/aws/smithy-go v1.14.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
 github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
@@ -527,6 +534,7 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=

internal/sql/repository/CiArtifactRepository.go

@@ -20,6 +20,7 @@ package repository
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/devtron-labs/devtron/internal/sql/repository/helper"
 	"github.com/devtron-labs/devtron/pkg/sql"
 	"strings"
 	"time"
@@ -59,6 +60,8 @@ type CiArtifactRepository interface {
 	GetByWfId(wfId int) (artifact *CiArtifact, err error)
 	GetArtifactsByCDPipeline(cdPipelineId, limit int, parentId int, parentType bean.WorkflowType) ([]*CiArtifact, error)
 
+	GetLatestArtifactTimeByCiPipelineIds(ciPipelineIds []int) ([]*CiArtifact, error)
+	GetLatestArtifactTimeByCiPipelineId(ciPipelineId int) (*CiArtifact, error)
 	GetArtifactsByCDPipelineV2(cdPipelineId int) ([]CiArtifact, error)
 	GetArtifactsByCDPipelineAndRunnerType(cdPipelineId int, runnerType bean.WorkflowType) ([]CiArtifact, error)
 	SaveAll(artifacts []*CiArtifact) error
@@ -236,6 +239,37 @@ func (impl CiArtifactRepositoryImpl) GetArtifactsByCDPipeline(cdPipelineId, limi
 	return artifactsAll, err
 }
 
+func (impl CiArtifactRepositoryImpl) GetLatestArtifactTimeByCiPipelineIds(ciPipelineIds []int) ([]*CiArtifact, error) {
+	artifacts := make([]*CiArtifact, 0)
+	query := "select cws.pipeline_id, cws.created_on from " +
+		"(SELECT  pipeline_id, MAX(created_on) created_on " +
+		"FROM ci_artifact " +
+		"GROUP BY pipeline_id) cws " +
+		"where cws.pipeline_id IN (" + helper.GetCommaSepratedString(ciPipelineIds) + "); "
+
+	_, err := impl.dbConnection.Query(&artifacts, query)
+	if err != nil {
+		return nil, err
+	}
+	return artifacts, nil
+}
+
+//GetLatestArtifactTimeByCiPipelineId will fetch latest ci artifact time(created) against that ci pipeline
+func (impl CiArtifactRepositoryImpl) GetLatestArtifactTimeByCiPipelineId(ciPipelineId int) (*CiArtifact, error) {
+	artifacts := &CiArtifact{}
+	query := "select cws.pipeline_id, cws.created_on from " +
+		"(SELECT  pipeline_id, MAX(created_on) created_on " +
+		"FROM ci_artifact " +
+		"GROUP BY pipeline_id) cws " +
+		"where cws.pipeline_id = ? ; "
+
+	_, err := impl.dbConnection.Query(artifacts, query, ciPipelineId)
+	if err != nil {
+		return nil, err
+	}
+	return artifacts, nil
+}
+
 func (impl CiArtifactRepositoryImpl) GetArtifactsByCDPipelineAndRunnerType(cdPipelineId int, runnerType bean.WorkflowType) ([]CiArtifact, error) {
 	var artifactsA []CiArtifact
 	var artifactsAB []CiArtifact

internal/sql/repository/pipelineConfig/CiPipelineRepository.go

@@ -44,6 +44,7 @@ type CiPipeline struct {
 	ParentCiPipeline         int    `sql:"parent_ci_pipeline"`
 	ScanEnabled              bool   `sql:"scan_enabled,notnull"`
 	IsDockerConfigOverridden bool   `sql:"is_docker_config_overridden, notnull"`
+	PipelineType             string `sql:"ci_pipeline_type"`
 	sql.AuditLog
 	CiPipelineMaterials []*CiPipelineMaterial
 	CiTemplate          *CiTemplate

pkg/appClone/AppCloneService.go

@@ -813,6 +813,7 @@ func (impl *AppCloneServiceImpl) CreateCiPipeline(req *cloneCiPipelineRequest) (
 					PreBuildStage:            preStageDetail,
 					PostBuildStage:           postStageDetail,
 					EnvironmentId:            refCiPipeline.EnvironmentId,
+					PipelineType:             refCiPipeline.PipelineType,
 				},
 				AppId:         req.appId,
 				Action:        bean.CREATE,

pkg/bean/app.go

@@ -183,6 +183,7 @@ const (
 	NORMAL   PipelineType = "NORMAL"
 	LINKED   PipelineType = "LINKED"
 	EXTERNAL PipelineType = "EXTERNAL"
+	CI_JOB   PipelineType = "CI_JOB"
 )
 
 const (
@@ -312,11 +313,13 @@ type CiPipelineMaterial struct {
 }
 
 type CiTriggerRequest struct {
-	PipelineId         int                  `json:"pipelineId"`
-	CiPipelineMaterial []CiPipelineMaterial `json:"ciPipelineMaterials" validate:"required"`
-	TriggeredBy        int32                `json:"triggeredBy"`
-	InvalidateCache    bool                 `json:"invalidateCache"`
-	EnvironmentId      int                  `json:"environmentId"`
+	PipelineId          int                  `json:"pipelineId"`
+	CiPipelineMaterial  []CiPipelineMaterial `json:"ciPipelineMaterials" validate:"required"`
+	TriggeredBy         int32                `json:"triggeredBy"`
+	InvalidateCache     bool                 `json:"invalidateCache"`
+	EnvironmentId       int                  `json:"environmentId"`
+	PipelineType        string               `json:"pipelineType"`
+	CiArtifactLastFetch time.Time            `json:"ciArtifactLastFetch"`
 }
 
 type CiTrigger struct {
@@ -367,6 +370,7 @@ type CiPipelineMinResponse struct {
 	AppName          string `json:"appName,omitempty"`
 	ParentCiPipeline int    `json:"parentCiPipeline"`
 	ParentAppId      int    `json:"parentAppId"`
+	PipelineType     string `json:"pipelineType"`
 }
 
 type TestExecutorImageProperties struct {