This is an automated email from the ASF dual-hosted git repository.
warren 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 20f2e4140 Scope fix (#4663)
20f2e4140 is described below
commit 20f2e4140bbf76761a67b902693e83781557adb3
Author: mappjzc <[email protected]>
AuthorDate: Wed Mar 15 11:21:10 2023 +0800
Scope fix (#4663)
* feat: add deploy colle
Add deploy collect for deploy project.
Add extract to get env data by plan.
Nddtfjiang <[email protected]>
* fix: fix bamboo scope
Fix bamboo scope use error type.
Nddtfjiang <[email protected]>
---
backend/helpers/pluginhelper/api/scope_helper.go | 9 +++++----
backend/plugins/bamboo/api/init.go | 6 +++---
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/backend/helpers/pluginhelper/api/scope_helper.go
b/backend/helpers/pluginhelper/api/scope_helper.go
index b153dfe27..5102eee88 100644
--- a/backend/helpers/pluginhelper/api/scope_helper.go
+++ b/backend/helpers/pluginhelper/api/scope_helper.go
@@ -20,6 +20,11 @@ package api
import (
"encoding/json"
"fmt"
+ "net/http"
+ "strconv"
+ "strings"
+ "time"
+
"github.com/apache/incubator-devlake/core/context"
"github.com/apache/incubator-devlake/core/dal"
"github.com/apache/incubator-devlake/core/errors"
@@ -28,10 +33,6 @@ import (
"github.com/go-playground/validator/v10"
"github.com/mitchellh/mapstructure"
"gorm.io/gorm"
- "net/http"
- "strconv"
- "strings"
- "time"
"reflect"
)
diff --git a/backend/plugins/bamboo/api/init.go
b/backend/plugins/bamboo/api/init.go
index 3044a56ba..91d9b0cbf 100644
--- a/backend/plugins/bamboo/api/init.go
+++ b/backend/plugins/bamboo/api/init.go
@@ -20,13 +20,13 @@ package api
import (
"github.com/apache/incubator-devlake/core/context"
"github.com/apache/incubator-devlake/helpers/pluginhelper/api"
- "github.com/apache/incubator-devlake/plugins/github/models"
+ "github.com/apache/incubator-devlake/plugins/bamboo/models"
"github.com/go-playground/validator/v10"
)
var vld *validator.Validate
var connectionHelper *api.ConnectionApiHelper
-var scopeHelper *api.ScopeApiHelper[models.GithubConnection,
models.GithubRepo, models.GithubTransformationRule]
+var scopeHelper *api.ScopeApiHelper[models.BambooConnection,
models.BambooProject, models.BambooTransformationRule]
var basicRes context.BasicRes
func Init(br context.BasicRes) {
@@ -36,7 +36,7 @@ func Init(br context.BasicRes) {
basicRes,
vld,
)
- scopeHelper = api.NewScopeHelper[models.GithubConnection,
models.GithubRepo, models.GithubTransformationRule](
+ scopeHelper = api.NewScopeHelper[models.BambooConnection,
models.BambooProject, models.BambooTransformationRule](
basicRes,
vld,
connectionHelper,
