Skip to content

fix: sonarqube connection delete on no scope config #7093

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
abeizn merged 2 commits into from
Mar 5, 2024
Merged

fix: sonarqube connection delete on no scope config #7093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
183e104
fix: sonarqube connection delete on no scope config
abeizn Mar 4, 2024
c5ad3a0
fix: delete some code
abeizn Mar 4, 2024
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
54 changes: 24 additions & 30 deletions backend/plugins/sonarqube/api/blueprint_v200.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (
"github.com/apache/incubator-devlake/core/models/domainlayer/codequality"
"github.com/apache/incubator-devlake/core/models/domainlayer/didgen"
"github.com/apache/incubator-devlake/core/plugin"
"github.com/apache/incubator-devlake/core/utils"
helper "github.com/apache/incubator-devlake/helpers/pluginhelper/api"
"github.com/apache/incubator-devlake/helpers/srvhelper"
"github.com/apache/incubator-devlake/plugins/sonarqube/models"
Expand Down Expand Up @@ -72,7 +71,7 @@ func MakeDataSourcePipelinePlanV200(

func makeDataSourcePipelinePlanV200(
subtaskMetas []plugin.SubTaskMeta,
scopeDetails []*srvhelper.ScopeDetail[models.SonarqubeProject, models.SonarqubeScopeConfig],
scopeDetails []*srvhelper.ScopeDetail[models.SonarqubeProject, srvhelper.NoScopeConfig],
connection *models.SonarqubeConnection,
) (coreModels.PipelinePlan, errors.Error) {
plan := make(coreModels.PipelinePlan, len(scopeDetails))
Expand All @@ -81,48 +80,43 @@ func makeDataSourcePipelinePlanV200(
if stage == nil {
stage = coreModels.PipelineStage{}
}

scope, scopeConfig := scopeDetail.Scope, scopeDetail.ScopeConfig
scope := scopeDetail.Scope
// construct task options
if utils.StringsContains(scopeConfig.Entities, plugin.DOMAIN_TYPE_CODE_QUALITY) {
task, err := helper.MakePipelinePlanTask(
"sonarqube",
subtaskMetas,
nil,
tasks.SonarqubeOptions{
ConnectionId: scope.ConnectionId,
ProjectKey: scope.ProjectKey,
},
)
if err != nil {
return nil, err
}

stage = append(stage, task)
plan[i] = stage
task, err := helper.MakePipelinePlanTask(
"sonarqube",
subtaskMetas,
nil,
tasks.SonarqubeOptions{
ConnectionId: scope.ConnectionId,
ProjectKey: scope.ProjectKey,
},
)
if err != nil {
return nil, err
}

stage = append(stage, task)
plan[i] = stage
}

return plan, nil
}

func makeScopesV200(
scopeDetails []*srvhelper.ScopeDetail[models.SonarqubeProject, models.SonarqubeScopeConfig],
scopeDetails []*srvhelper.ScopeDetail[models.SonarqubeProject, srvhelper.NoScopeConfig],
connection *models.SonarqubeConnection,
) ([]plugin.Scope, errors.Error) {
scopes := make([]plugin.Scope, 0)
for _, scopeDetail := range scopeDetails {
sonarqubeProject, scopeConfig := scopeDetail.Scope, scopeDetail.ScopeConfig
sonarqubeProject := scopeDetail.Scope
// add board to scopes
if utils.StringsContains(scopeConfig.Entities, plugin.DOMAIN_TYPE_CODE_QUALITY) {
domainBoard := &codequality.CqProject{
DomainEntity: domainlayer.DomainEntity{
Id: didgen.NewDomainIdGenerator(&models.SonarqubeProject{}).Generate(sonarqubeProject.ConnectionId, sonarqubeProject.ProjectKey),
},
Name: sonarqubeProject.Name,
}
scopes = append(scopes, domainBoard)
domainBoard := &codequality.CqProject{
DomainEntity: domainlayer.DomainEntity{
Id: didgen.NewDomainIdGenerator(&models.SonarqubeProject{}).Generate(sonarqubeProject.ConnectionId, sonarqubeProject.ProjectKey),
},
Name: sonarqubeProject.Name,
}
scopes = append(scopes, domainBoard)
}

return scopes, nil
Expand Down
5 changes: 3 additions & 2 deletions backend/plugins/sonarqube/api/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,15 @@ import (
"github.com/apache/incubator-devlake/core/context"
"github.com/apache/incubator-devlake/core/plugin"
"github.com/apache/incubator-devlake/helpers/pluginhelper/api"
"github.com/apache/incubator-devlake/helpers/srvhelper"
"github.com/apache/incubator-devlake/plugins/sonarqube/models"
"github.com/go-playground/validator/v10"
)

var vld *validator.Validate
var basicRes context.BasicRes

var dsHelper *api.DsHelper[models.SonarqubeConnection, models.SonarqubeProject, models.SonarqubeScopeConfig]
var dsHelper *api.DsHelper[models.SonarqubeConnection, models.SonarqubeProject, srvhelper.NoScopeConfig]
var raProxy *api.DsRemoteApiProxyHelper[models.SonarqubeConnection]
var raScopeList *api.DsRemoteApiScopeListHelper[models.SonarqubeConnection, models.SonarqubeProject, SonarqubeRemotePagination]
var raScopeSearch *api.DsRemoteApiScopeSearchHelper[models.SonarqubeConnection, models.SonarqubeProject]
Expand All @@ -39,7 +40,7 @@ func Init(br context.BasicRes, p plugin.PluginMeta) {
dsHelper = api.NewDataSourceHelper[
models.SonarqubeConnection,
models.SonarqubeProject,
models.SonarqubeScopeConfig,
srvhelper.NoScopeConfig,
](
br,
p.Name(),
Expand Down