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 de80bcd85 refactor: webhook migration scripts (#3515)
de80bcd85 is described below
commit de80bcd85815e2f96c441ac2c6bf08e49507a2db
Author: mappjzc <[email protected]>
AuthorDate: Fri Oct 21 10:13:01 2022 +0800
refactor: webhook migration scripts (#3515)
Refactor Webhook MigrationScripts.
Nddtfjiang <[email protected]>
---
plugins/webhook/impl/impl.go | 4 ++--
.../models/migrationscripts/20220908_add_init_tables.go | 11 ++++++-----
plugins/webhook/models/migrationscripts/register.go | 8 +++++---
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/plugins/webhook/impl/impl.go b/plugins/webhook/impl/impl.go
index 4301509ad..e555d6f96 100644
--- a/plugins/webhook/impl/impl.go
+++ b/plugins/webhook/impl/impl.go
@@ -19,7 +19,6 @@ package impl
import (
"github.com/apache/incubator-devlake/errors"
- "github.com/apache/incubator-devlake/migration"
"github.com/apache/incubator-devlake/plugins/core"
"github.com/apache/incubator-devlake/plugins/webhook/api"
"github.com/apache/incubator-devlake/plugins/webhook/models/migrationscripts"
@@ -31,6 +30,7 @@ import (
var _ core.PluginMeta = (*Webhook)(nil)
var _ core.PluginInit = (*Webhook)(nil)
var _ core.PluginApi = (*Webhook)(nil)
+var _ core.PluginMigration = (*Webhook)(nil)
type Webhook struct{}
@@ -48,7 +48,7 @@ func (plugin Webhook) RootPkgPath() string {
return "github.com/apache/incubator-devlake/plugins/webhook"
}
-func (plugin Webhook) MigrationScripts() []migration.Script {
+func (plugin Webhook) MigrationScripts() []core.MigrationScript {
return migrationscripts.All()
}
diff --git
a/plugins/webhook/models/migrationscripts/20220908_add_init_tables.go
b/plugins/webhook/models/migrationscripts/20220908_add_init_tables.go
index c8bf323b1..4a183be97 100644
--- a/plugins/webhook/models/migrationscripts/20220908_add_init_tables.go
+++ b/plugins/webhook/models/migrationscripts/20220908_add_init_tables.go
@@ -18,18 +18,19 @@ limitations under the License.
package migrationscripts
import (
- "context"
"github.com/apache/incubator-devlake/errors"
+ "github.com/apache/incubator-devlake/helpers/migrationhelper"
+ "github.com/apache/incubator-devlake/plugins/core"
"github.com/apache/incubator-devlake/plugins/webhook/models/migrationscripts/archived"
- "gorm.io/gorm"
)
type addInitTables struct{}
-func (u *addInitTables) Up(ctx context.Context, db *gorm.DB) errors.Error {
- return errors.Convert(db.Migrator().AutoMigrate(
+func (u *addInitTables) Up(baseRes core.BasicRes) errors.Error {
+ return migrationhelper.AutoMigrateTables(
+ baseRes,
&archived.WebhookConnection{},
- ))
+ )
}
func (*addInitTables) Version() uint64 {
diff --git a/plugins/webhook/models/migrationscripts/register.go
b/plugins/webhook/models/migrationscripts/register.go
index 92e20c010..c0c766cd6 100644
--- a/plugins/webhook/models/migrationscripts/register.go
+++ b/plugins/webhook/models/migrationscripts/register.go
@@ -17,11 +17,13 @@ limitations under the License.
package migrationscripts
-import "github.com/apache/incubator-devlake/migration"
+import (
+ "github.com/apache/incubator-devlake/plugins/core"
+)
// All return all the migration scripts
-func All() []migration.Script {
- return []migration.Script{
+func All() []core.MigrationScript {
+ return []core.MigrationScript{
new(addInitTables),
}
}