Skip to content

fix: bitbucket_server doesn't support ENABLE_SUBTASKS_BY_DEFAULT envvar #8508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 23, 2025
Merged

fix: bitbucket_server doesn't support ENABLE_SUBTASKS_BY_DEFAULT envvar #8508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion backend/plugins/bitbucket/api/blueprint_v200.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ func makeDataSourcePipelinePlanV200(
if stage == nil {
stage = coreModels.PipelineStage{}
}
// construct task options for Jira
task, err := helper.MakePipelinePlanTask(
"bitbucket",
subtaskMetas,
Expand Down
54 changes: 23 additions & 31 deletions backend/plugins/bitbucket_server/api/blueprint_v200.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,26 @@ func makeDataSourcePipelinePlanV200(
) (coreModels.PipelinePlan, errors.Error) {
plan := make(coreModels.PipelinePlan, len(scopeDetails))
for i, scopeDetail := range scopeDetails {
repo, scopeConfig := scopeDetail.Scope, scopeDetail.ScopeConfig
bitbucketRepo, scopeConfig := scopeDetail.Scope, scopeDetail.ScopeConfig
stage := plan[i]
if stage == nil {
stage = coreModels.PipelineStage{}
}
task, err := helper.MakePipelinePlanTask(
"bitbucket_server",
subtaskMetas,
scopeConfig.Entities,
tasks.BitbucketServerOptions{
ConnectionId: bitbucketRepo.ConnectionId,
FullName: bitbucketRepo.BitbucketId,
},
)
if err != nil {
return nil, err
}

stage = append(stage, task)

// refdiff
if scopeConfig != nil && scopeConfig.Refdiff != nil {
// add a new task to next stage
Expand All @@ -90,7 +105,7 @@ func makeDataSourcePipelinePlanV200(
plan = append(plan, nil)
}
refdiffOp := scopeConfig.Refdiff
refdiffOp["repoId"] = didgen.NewDomainIdGenerator(&models.BitbucketServerRepo{}).Generate(connection.ID, repo.BitbucketId)
refdiffOp["repoId"] = didgen.NewDomainIdGenerator(&models.BitbucketServerRepo{}).Generate(connection.ID, bitbucketRepo.BitbucketId)
plan[j] = coreModels.PipelineStage{
{
Plugin: "refdiff",
Expand All @@ -99,44 +114,21 @@ func makeDataSourcePipelinePlanV200(
}
scopeConfig.Refdiff = nil
}

// construct task options for bitbucket
op := &tasks.BitbucketServerOptions{
ConnectionId: repo.ConnectionId,
FullName: repo.BitbucketId,
}
options, err := tasks.EncodeTaskOptions(op)
if err != nil {
return nil, err
}

subtasks, err := helper.MakePipelinePlanSubtasks(subtaskMetas, scopeConfig.Entities)
if err != nil {
return nil, err
}
stage = append(stage, &coreModels.PipelineTask{
Plugin: "bitbucket_server",
Subtasks: subtasks,
Options: options,
})
if err != nil {
return nil, err
}

// add gitex stage
if utils.StringsContains(scopeConfig.Entities, plugin.DOMAIN_TYPE_CODE) {
cloneUrl, err := errors.Convert01(url.Parse(repo.CloneUrl))
cloneUrl, err := errors.Convert01(url.Parse(bitbucketRepo.CloneUrl))
if err != nil {
return nil, err
}
cloneUrl.User = url.UserPassword(connection.Username, connection.Password)
stage = append(stage, &coreModels.PipelineTask{
Plugin: "gitextractor",
Options: map[string]interface{}{
"url": cloneUrl.String(),
"name": repo.BitbucketId,
"repoId": didgen.NewDomainIdGenerator(&models.BitbucketServerRepo{}).Generate(connection.ID, repo.BitbucketId),
"proxy": connection.Proxy,
"url": cloneUrl.String(),
"name": bitbucketRepo.BitbucketId,
"fullName": bitbucketRepo.BitbucketId,
"repoId": didgen.NewDomainIdGenerator(&models.BitbucketServerRepo{}).Generate(connection.ID, bitbucketRepo.BitbucketId),
"proxy": connection.Proxy,
},
})

Expand Down
Loading