From b0a04b860b1b1dfb286ffc19d9c4c18cf38252f6 Mon Sep 17 00:00:00 2001 From: abeizn Date: Fri, 20 Sep 2024 11:25:06 +0800 Subject: [PATCH] fix: jenkins can not get scope config --- backend/plugins/jenkins/impl/impl.go | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/backend/plugins/jenkins/impl/impl.go b/backend/plugins/jenkins/impl/impl.go index be95891529b..cc96b6a27d0 100644 --- a/backend/plugins/jenkins/impl/impl.go +++ b/backend/plugins/jenkins/impl/impl.go @@ -118,9 +118,6 @@ func (p Jenkins) PrepareTaskData(taskCtx plugin.TaskContext, options map[string] nil, p.Name(), ) - if err != nil { - return nil, err - } err = connectionHelper.FirstById(connection, op.ConnectionId) if err != nil { return nil, err @@ -295,19 +292,18 @@ func EnrichOptions(taskCtx plugin.TaskContext, op.JobPath = fmt.Sprintf("%s/", op.JobPath) } // We only set op.JenkinsScopeConfig when it's nil and we have op.ScopeConfigId != 0 - if op.ScopeConfig.DeploymentPattern != nil && op.ScopeConfig.ProductionPattern != nil { - if *op.ScopeConfig.DeploymentPattern == "" && *op.ScopeConfig.ProductionPattern == "" && op.ScopeConfigId != 0 { - var scopeConfig models.JenkinsScopeConfig - err = taskCtx.GetDal().First(&scopeConfig, dal.Where("id = ?", op.ScopeConfigId)) - if err != nil { - return errors.BadInput.Wrap(err, "fail to get scopeConfig") - } - op.ScopeConfig = &scopeConfig + if op.ScopeConfig.DeploymentPattern == nil && op.ScopeConfig.ProductionPattern == nil && op.ScopeConfigId != 0 { + var scopeConfig models.JenkinsScopeConfig + err = taskCtx.GetDal().First(&scopeConfig, dal.Where("id = ?", op.ScopeConfigId)) + if err != nil { + return errors.BadInput.Wrap(err, "fail to get scopeConfig") } + op.ScopeConfig = &scopeConfig + } - if *op.ScopeConfig.DeploymentPattern == "" && *op.ScopeConfig.ProductionPattern == "" && op.ScopeConfigId == 0 { - op.ScopeConfig = new(models.JenkinsScopeConfig) - } + if *op.ScopeConfig.DeploymentPattern == "" && *op.ScopeConfig.ProductionPattern == "" && op.ScopeConfigId == 0 { + op.ScopeConfig = new(models.JenkinsScopeConfig) } + return nil }