fix distribute image image pull error (#4280)

Signed-off-by: Min Min <[email protected]>

Author: jamsman94

pkg/microservice/aslan/core/common/service/registry.go

@@ -33,6 +33,9 @@ import (
 )
 
 func FindRegistryById(registryId string, getRealCredential bool, log *zap.SugaredLogger) (reg *models.RegistryNamespace, err error) {
+	if registryId == "" {
+		return nil, fmt.Errorf("registryId is empty")
+	}
 	return findRegisty(&mongodb.FindRegOps{ID: registryId}, getRealCredential, log)
 }
 

pkg/microservice/aslan/core/workflow/service/workflow/controller/job/job_distribute_image.go

@@ -165,14 +165,9 @@ func (j DistributeImageJobController) ToTask(taskID int64) ([]*commonmodels.JobT
 	logger := log.SugaredLogger()
 	resp := make([]*commonmodels.JobTask, 0)
 
-	sourceReg, err := commonservice.FindRegistryById(j.jobSpec.SourceRegistryID, true, logger)
-	if err != nil {
-		return resp, fmt.Errorf("source image registry: %s not found: %v", j.jobSpec.SourceRegistryID, err)
-	}
-	targetReg, err := commonservice.FindRegistryById(j.jobSpec.TargetRegistryID, true, logger)
-	if err != nil {
-		return resp, fmt.Errorf("target image registry: %s not found: %v", j.jobSpec.TargetRegistryID, err)
-	}
+	var sourceReg *commonmodels.RegistryNamespace
+	var targetReg *commonmodels.RegistryNamespace
+	var err error
 
 	switch j.jobSpec.Source {
 	case config.SourceFromJob:
@@ -184,6 +179,11 @@ func (j DistributeImageJobController) ToTask(taskID int64) ([]*commonmodels.JobT
 
 		j.jobSpec.SourceRegistryID = registryID
 
+		sourceReg, err = commonservice.FindRegistryById(j.jobSpec.SourceRegistryID, true, logger)
+		if err != nil {
+			return resp, fmt.Errorf("source image registry: %s not found: %v", j.jobSpec.SourceRegistryID, err)
+		}
+
 		targetTagMap := map[string]commonmodels.DistributeTarget{}
 		for _, target := range j.jobSpec.Targets {
 			targetTagMap[getServiceKey(target.ServiceName, target.ServiceModule)] = *target
@@ -204,6 +204,11 @@ func (j DistributeImageJobController) ToTask(taskID int64) ([]*commonmodels.JobT
 
 		j.jobSpec.Targets = targets
 	case config.SourceRuntime:
+		sourceReg, err = commonservice.FindRegistryById(j.jobSpec.SourceRegistryID, true, logger)
+		if err != nil {
+			return resp, fmt.Errorf("source image registry: %s not found: %v", j.jobSpec.SourceRegistryID, err)
+		}
+
 		for _, target := range j.jobSpec.Targets {
 			if target.ImageName == "" {
 				target.SourceImage = getImage(target.ServiceModule, target.SourceTag, sourceReg)
@@ -218,6 +223,11 @@ func (j DistributeImageJobController) ToTask(taskID int64) ([]*commonmodels.JobT
 		}
 	}
 
+	targetReg, err = commonservice.FindRegistryById(j.jobSpec.TargetRegistryID, true, logger)
+	if err != nil {
+		return resp, fmt.Errorf("target image registry: %s not found: %v", j.jobSpec.TargetRegistryID, err)
+	}
+
 	stepSpec := &step.StepImageDistributeSpec{
 		Type:           j.jobSpec.DistributeMethod,
 		SourceRegistry: getRegistry(sourceReg),