This is an automated email from the ASF dual-hosted git repository.
mappjzc pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
The following commit(s) were added to refs/heads/main by this push:
new d77055092 fix(sonarqube): put scope bug (#4432)
d77055092 is described below
commit d7705509274aa4ee0e76ef374dbd5eefbd7e1e33
Author: abeizn <[email protected]>
AuthorDate: Thu Feb 16 19:27:30 2023 +0800
fix(sonarqube): put scope bug (#4432)
* fix: scope connectionId can not work
* fix(sonarqube): change decode type to process lastAnalysisDate
---------
Co-authored-by: Yingchu Chen <[email protected]>
---
backend/plugins/sonarqube/api/scope.go | 5 ++---
.../sonarqube/models/migrationscripts/archived/sonarqube_project.go | 2 +-
backend/plugins/sonarqube/models/sonarqube_project.go | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/backend/plugins/sonarqube/api/scope.go
b/backend/plugins/sonarqube/api/scope.go
index d8ed6336b..063020133 100644
--- a/backend/plugins/sonarqube/api/scope.go
+++ b/backend/plugins/sonarqube/api/scope.go
@@ -26,8 +26,6 @@ import (
"github.com/apache/incubator-devlake/core/plugin"
"github.com/apache/incubator-devlake/helpers/pluginhelper/api"
"github.com/apache/incubator-devlake/plugins/sonarqube/models"
-
- "github.com/mitchellh/mapstructure"
)
type req struct {
@@ -51,7 +49,8 @@ func PutScope(input *plugin.ApiResourceInput)
(*plugin.ApiResourceOutput, errors
return nil, errors.BadInput.New("invalid connectionId")
}
var projects req
- err := errors.Convert(mapstructure.Decode(input.Body, &projects))
+ // As we need to process *api.Iso8601Time, we need to use
DecodeMapStruct instead of mapstructure.Decode
+ err := errors.Convert(api.DecodeMapStruct(input.Body, &projects))
if err != nil {
return nil, errors.BadInput.Wrap(err, "decoding Sonarqube
project error")
}
diff --git
a/backend/plugins/sonarqube/models/migrationscripts/archived/sonarqube_project.go
b/backend/plugins/sonarqube/models/migrationscripts/archived/sonarqube_project.go
index 030e78d80..e1db5d410 100644
---
a/backend/plugins/sonarqube/models/migrationscripts/archived/sonarqube_project.go
+++
b/backend/plugins/sonarqube/models/migrationscripts/archived/sonarqube_project.go
@@ -24,7 +24,7 @@ import (
)
type SonarqubeProject struct {
- ConnectionId uint64 `gorm:"primaryKey"`
+ ConnectionId uint64 `json:"connectionId" gorm:"primaryKey"`
ProjectKey string `json:"projectKey"
gorm:"type:varchar(64);primaryKey"`
Name string `json:"name" gorm:"type:varchar(255)"`
Qualifier string `json:"qualifier" gorm:"type:varchar(255)"`
diff --git a/backend/plugins/sonarqube/models/sonarqube_project.go
b/backend/plugins/sonarqube/models/sonarqube_project.go
index 0c44075dd..90616b821 100644
--- a/backend/plugins/sonarqube/models/sonarqube_project.go
+++ b/backend/plugins/sonarqube/models/sonarqube_project.go
@@ -24,7 +24,7 @@ import (
type SonarqubeProject struct {
common.NoPKModel `json:"-" mapstructure:"-"`
- ConnectionId uint64 `gorm:"primaryKey"`
+ ConnectionId uint64 `json:"connectionId"
gorm:"primaryKey"`
ProjectKey string `json:"projectKey"
gorm:"type:varchar(64);primaryKey"`
Name string `json:"name" gorm:"type:varchar(255)"`
Qualifier string `json:"qualifier"
gorm:"type:varchar(255)"`
