This is an automated email from the ASF dual-hosted git repository.
klesh 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 2cbc097e feat: multi-data connections support for Jenkins and Gitlab
(#2239)
2cbc097e is described below
commit 2cbc097e4103ac5b51274460e29475efdedf3ba0
Author: abeizn <[email protected]>
AuthorDate: Sat Jun 18 00:59:02 2022 +0800
feat: multi-data connections support for Jenkins and Gitlab (#2239)
* feat: multi-data connections support for Jenkins and Gitlab
* feat: multi-data connections support for Jenkins and Gitlab
---
.../gitlab/models/migrationscripts/init_schema.go | 38 ++++++++++++---------
.../jenkins/models/migrationscripts/init_schema.go | 39 +++++++++++++---------
plugins/starrocks/tasks.go | 2 +-
3 files changed, 47 insertions(+), 32 deletions(-)
diff --git a/plugins/gitlab/models/migrationscripts/init_schema.go
b/plugins/gitlab/models/migrationscripts/init_schema.go
index 1f5cba27..00db45fb 100644
--- a/plugins/gitlab/models/migrationscripts/init_schema.go
+++ b/plugins/gitlab/models/migrationscripts/init_schema.go
@@ -20,6 +20,7 @@ package migrationscripts
import (
"context"
"fmt"
+
"github.com/apache/incubator-devlake/config"
"github.com/apache/incubator-devlake/plugins/core"
"github.com/apache/incubator-devlake/plugins/gitlab/models/migrationscripts/archived"
@@ -90,25 +91,32 @@ func (*InitSchemas) Up(ctx context.Context, db *gorm.DB)
error {
return err
}
- conn := &archived.GitlabConnection{}
v := config.GetConfig()
- encKey := v.GetString(core.EncodeKeyEnvStr)
-
- conn.Name = "init gitlab connection"
- conn.ID = 1
- conn.Endpoint = v.GetString("GITLAB_ENDPOINT")
- conn.Token, err = core.Encrypt(encKey, v.GetString("GITLAB_AUTH"))
- if err != nil {
- return err
- }
- conn.Proxy = v.GetString("GITLAB_PROXY")
- conn.RateLimit = v.GetInt("GITLAB_API_REQUESTS_PER_HOUR")
+ encKey := v.GetString("ENCODE_KEY")
+ endPoint := v.GetString("GITLAB_ENDPOINT")
+ gitlabAuth := v.GetString("GITLAB_AUTH")
+
+ if encKey == "" || endPoint == "" || gitlabAuth == "" {
+ return nil
+ } else {
+ conn := &archived.GitlabConnection{}
+ conn.Name = "init gitlab connection"
+ conn.ID = 1
+ conn.Endpoint = endPoint
+ conn.Token, err = core.Encrypt(encKey, gitlabAuth)
+ if err != nil {
+ return err
+ }
+ conn.Proxy = v.GetString("GITLAB_PROXY")
+ conn.RateLimit = v.GetInt("GITLAB_API_REQUESTS_PER_HOUR")
- err = db.Clauses(clause.OnConflict{DoNothing: true}).Create(conn).Error
+ err = db.Clauses(clause.OnConflict{DoNothing:
true}).Create(conn).Error
- if err != nil {
- return err
+ if err != nil {
+ return err
+ }
}
+
return nil
}
diff --git a/plugins/jenkins/models/migrationscripts/init_schema.go
b/plugins/jenkins/models/migrationscripts/init_schema.go
index 07883f47..9dd9403d 100644
--- a/plugins/jenkins/models/migrationscripts/init_schema.go
+++ b/plugins/jenkins/models/migrationscripts/init_schema.go
@@ -50,24 +50,31 @@ func (*InitSchemas) Up(ctx context.Context, db *gorm.DB)
error {
return err
}
- conn := &archived.JenkinsConnection{}
v := config.GetConfig()
- conn.Name = "init jenkins connection"
- conn.ID = 1
- conn.Endpoint = v.GetString("JENKINS_ENDPOINT")
- conn.Proxy = v.GetString("JENKINS_PROXY")
- conn.RateLimit = v.GetInt("JENKINS_API_REQUESTS_PER_HOUR")
- conn.Username = v.GetString("JENKINS_USERNAME")
- encKey := v.GetString(core.EncodeKeyEnvStr)
- conn.Password, err = core.Encrypt(encKey,
v.GetString("JENKINS_PASSWORD"))
- if err != nil {
- return err
- }
- err = db.Clauses(clause.OnConflict{DoNothing: true}).Create(conn).Error
-
- if err != nil {
- return err
+ encKey := v.GetString("ENCODE_KEY")
+ endPoint := v.GetString("JENKINS_ENDPOINT")
+ useName := v.GetString("JENKINS_USERNAME")
+ passWord := v.GetString("JENKINS_PASSWORD")
+ if encKey == "" || endPoint == "" || useName == "" || passWord == "" {
+ return nil
+ } else {
+ conn := &archived.JenkinsConnection{}
+ conn.Name = "init jenkins connection"
+ conn.ID = 1
+ conn.Endpoint = endPoint
+ conn.Proxy = v.GetString("JENKINS_PROXY")
+ conn.RateLimit = v.GetInt("JENKINS_API_REQUESTS_PER_HOUR")
+ conn.Username = useName
+ conn.Password, err = core.Encrypt(encKey, passWord)
+ if err != nil {
+ return err
+ }
+ err = db.Clauses(clause.OnConflict{DoNothing:
true}).Create(conn).Error
+
+ if err != nil {
+ return err
+ }
}
return nil
diff --git a/plugins/starrocks/tasks.go b/plugins/starrocks/tasks.go
index 476ffde9..83c7e7d4 100644
--- a/plugins/starrocks/tasks.go
+++ b/plugins/starrocks/tasks.go
@@ -67,7 +67,7 @@ func loadData(starrocks *sql.DB, c core.SubTaskContext, table
string, db dal.Dal
row := make(map[string]interface{})
columns := make([]string, len(cols))
columnPointers := make([]interface{}, len(cols))
- for i, _ := range columns {
+ for i := range columns {
columnPointers[i] = &columns[i]
}
err = rows.Scan(columnPointers...)
