debug

Signed-off-by: Min Min <jamsman94@gmail.com>

pkg/microservice/aslan/core/common/repository/models/workflow_v4.go

@@ -450,8 +450,7 @@ type TestModule struct {
 }
 
 type ZadigScanningJobSpec struct {
-	Scannings       []*ScanningModule `bson:"scannings"     yaml:"scannings"        json:"scannings"`
-	ScanningOptions []*ScanningModule `bson:"-"             yaml:"scanning_options" json:"scanning_options"`
+	Scannings []*ScanningModule `bson:"scannings"     yaml:"scannings"        json:"scannings"`
 }
 
 type ScanningModule struct {

pkg/microservice/aslan/core/workflow/service/workflow/job/job_deploy.go

@@ -234,6 +234,11 @@ func (j *DeployJob) SetOptions() error {
 		}
 
 		for _, env := range products {
+			// skip the sleeping envs
+			if env.IsSleeping() {
+				continue
+			}
+
 			serviceDeployOption, err := generateEnvDeployServiceInfo(env.EnvName, j.workflow.Project, j.spec.Production, j.spec)
 			if err != nil {
 				log.Errorf("failed to generate service deployment info for env: %s, error: %s", env.EnvName, err)

pkg/microservice/aslan/core/workflow/service/workflow/job/job_scanning.go

@@ -55,59 +55,11 @@ func (j *ScanningJob) SetPreset() error {
 		return err
 	}
 
-	j.spec.Scannings = make([]*commonmodels.ScanningModule, 0)
 	j.job.Spec = j.spec
 	return nil
 }
 
 func (j *ScanningJob) SetOptions() error {
-	j.spec = &commonmodels.ZadigScanningJobSpec{}
-	if err := commonmodels.IToi(j.job.Spec, j.spec); err != nil {
-		return err
-	}
-
-	originalWorkflow, err := commonrepo.NewWorkflowV4Coll().Find(j.workflow.Name)
-	if err != nil {
-		log.Errorf("Failed to find original workflow to set options, error: %s", err)
-	}
-
-	originalSpec := new(commonmodels.ZadigScanningJobSpec)
-	found := false
-	for _, stage := range originalWorkflow.Stages {
-		if !found {
-			for _, job := range stage.Jobs {
-				if job.Name == j.job.Name && job.JobType == j.job.JobType {
-					if err := commonmodels.IToi(job.Spec, originalSpec); err != nil {
-						return err
-					}
-					found = true
-					break
-				}
-			}
-		} else {
-			break
-		}
-	}
-
-	if !found {
-		return fmt.Errorf("failed to find the original workflow: %s", j.workflow.Name)
-	}
-
-	for _, scanning := range originalSpec.Scannings {
-		scanningInfo, err := commonrepo.NewScanningColl().Find(j.workflow.Project, scanning.Name)
-		if err != nil {
-			log.Errorf("find scanning: %s error: %v", scanning.Name, err)
-			continue
-		}
-		if err := fillScanningDetail(scanningInfo); err != nil {
-			log.Errorf("fill scanning: %s detail error: %v", scanningInfo.Name, err)
-			continue
-		}
-		scanning.Repos = mergeRepos(scanningInfo.Repos, scanning.Repos)
-		scanning.KeyVals = renderKeyVals(scanning.KeyVals, scanningInfo.Envs)
-	}
-
-	j.spec.ScanningOptions = originalSpec.Scannings
 	return nil
 }