You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by wa...@apache.org on 2022/07/19 07:51:00 UTC
[incubator-devlake] 06/06: fix: jira verify enckey and jira encode password
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
commit dc1b6119376ae0db12664562e414aa495192004c
Author: abeizn <zi...@merico.dev>
AuthorDate: Tue Jul 19 15:31:23 2022 +0800
fix: jira verify enckey and jira encode password
---
plugins/jira/models/migrationscripts/init_schema.go | 10 +++++-----
plugins/jira/models/migrationscripts/pre_init_schemas.go | 16 ++++++++--------
plugins/jira/models/migrationscripts/register.go | 2 +-
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/plugins/jira/models/migrationscripts/init_schema.go b/plugins/jira/models/migrationscripts/init_schema.go
index 7c60c3b6..2545751d 100644
--- a/plugins/jira/models/migrationscripts/init_schema.go
+++ b/plugins/jira/models/migrationscripts/init_schema.go
@@ -30,7 +30,7 @@ import (
"gorm.io/gorm"
)
-type JiraConnectionV11 struct {
+type JiraConnectionV011 struct {
ID uint64 `gorm:"primaryKey" json:"id"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
@@ -44,7 +44,7 @@ type JiraConnectionV11 struct {
RateLimit int `comment:"api request rate limt per hour" json:"rateLimit"`
}
-func (JiraConnectionV11) TableName() string {
+func (JiraConnectionV011) TableName() string {
return "_tool_jira_connections"
}
@@ -86,12 +86,12 @@ func (*InitSchemas) Up(ctx context.Context, db *gorm.DB) error {
var result *gorm.DB
m := db.Migrator()
- if m.HasTable(&JiraConnectionV11{}) {
- var jiraConns []JiraConnectionV11
+ if m.HasTable(&JiraConnectionV011{}) {
+ var jiraConns []JiraConnectionV011
result = db.Find(&jiraConns)
if result.Error == nil {
- err := db.Migrator().DropTable(&JiraConnectionV11{})
+ err := db.Migrator().DropTable(&JiraConnectionV011{})
if err != nil {
return err
}
diff --git a/plugins/jira/models/migrationscripts/pre_init_schemas.go b/plugins/jira/models/migrationscripts/pre_init_schemas.go
index c75aa459..d5d8b8a9 100644
--- a/plugins/jira/models/migrationscripts/pre_init_schemas.go
+++ b/plugins/jira/models/migrationscripts/pre_init_schemas.go
@@ -23,7 +23,7 @@ import (
"gorm.io/gorm"
)
-type JiraConnection20220505 struct {
+type JiraConnectionV010 struct {
common.Model
Name string `gorm:"type:varchar(100);uniqueIndex" json:"name" validate:"required"`
Endpoint string `json:"endpoint" validate:"required"`
@@ -35,16 +35,16 @@ type JiraConnection20220505 struct {
RateLimit int `comment:"api request rate limt per hour" json:"rateLimit"`
}
-func (JiraConnection20220505) TableName() string {
+func (JiraConnectionV010) TableName() string {
return "_tool_jira_connections"
}
-type UpdateSchemas20220505 struct{}
+type PreJiraInitSchemas struct{}
-func (*UpdateSchemas20220505) Up(ctx context.Context, db *gorm.DB) error {
+func (*PreJiraInitSchemas) Up(ctx context.Context, db *gorm.DB) error {
m := db.Migrator()
if m.HasTable(&archived.JiraSource{}) && !m.HasTable(&archived.JiraConnection{}) {
- err := db.Migrator().RenameTable(archived.JiraSource{}, JiraConnection20220505{})
+ err := db.Migrator().RenameTable(archived.JiraSource{}, JiraConnectionV010{})
if err != nil {
return err
}
@@ -52,14 +52,14 @@ func (*UpdateSchemas20220505) Up(ctx context.Context, db *gorm.DB) error {
return nil
}
-func (*UpdateSchemas20220505) Version() uint64 {
+func (*PreJiraInitSchemas) Version() uint64 {
return 20220505212344
}
-func (*UpdateSchemas20220505) Owner() string {
+func (*PreJiraInitSchemas) Owner() string {
return "Jira"
}
-func (*UpdateSchemas20220505) Name() string {
+func (*PreJiraInitSchemas) Name() string {
return "preparation for jira init_schemas"
}
diff --git a/plugins/jira/models/migrationscripts/register.go b/plugins/jira/models/migrationscripts/register.go
index e1634eae..78b36264 100644
--- a/plugins/jira/models/migrationscripts/register.go
+++ b/plugins/jira/models/migrationscripts/register.go
@@ -24,7 +24,7 @@ import (
// All return all the migration scripts
func All() []migration.Script {
return []migration.Script{
- new(UpdateSchemas20220505),
+ new(PreJiraInitSchemas),
new(InitSchemas),
}
}