From 3cf3bf0baaeb12487c974d624a5614b7c8287c83 Mon Sep 17 00:00:00 2001 From: Jeff Ortel Date: Mon, 24 Jun 2024 06:18:18 -0700 Subject: [PATCH 1/2] Add task.kind in migration 14. Signed-off-by: Jeff Ortel --- hack/add/task.sh | 2 +- migration/v14/migrate.go | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/hack/add/task.sh b/hack/add/task.sh index efd39309..37c6b36a 100755 --- a/hack/add/task.sh +++ b/hack/add/task.sh @@ -6,7 +6,7 @@ curl -X POST ${host}/tasks -d \ '{ "name":"Test", "locator": "app.1.test", - "addon": "test", + "addon": "analyzer", "application": {"id": 1}, "data": { "path": "/etc" diff --git a/migration/v14/migrate.go b/migration/v14/migrate.go index 00db54ca..132fdd52 100644 --- a/migration/v14/migrate.go +++ b/migration/v14/migrate.go @@ -17,7 +17,20 @@ func (r Migration) Apply(db *gorm.DB) (err error) { if err != nil { return } - // add mvn:// prefix. + err = r.mavenPrefix(db) + if err != nil { + return + } + err = r.taskKind(db) + if err != nil { + return + } + return +} + +// mavenPrefix ensures the Application.Binary which are maven +// coordinates have the mvn:// prefix added in 0.5. +func (r Migration) mavenPrefix(db *gorm.DB) (err error) { prefix := "mvn://" var list []*model.Application err = db.Find(&list).Error @@ -37,6 +50,27 @@ func (r Migration) Apply(db *gorm.DB) (err error) { return } +// taskKind ensures tasks have a kind. +// In 0.5 task (kinds) added. A task named `analyzer` is +// installed by the operator. +func (r Migration) taskKind(db *gorm.DB) (err error) { + var list []*model.Task + err = db.Find(&list).Error + if err != nil { + return + } + for _, m := range list { + if m.Kind == "" { + m.Kind = m.Addon + } + err = db.Save(m).Error + if err != nil { + return + } + } + return +} + func (r Migration) Models() []any { return model.All() } From 7ee73d918fa975ce0971b244af437c22a7728381 Mon Sep 17 00:00:00 2001 From: Jeff Ortel Date: Mon, 24 Jun 2024 06:27:45 -0700 Subject: [PATCH 2/2] checkpoint Signed-off-by: Jeff Ortel --- migration/v14/migrate.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/migration/v14/migrate.go b/migration/v14/migrate.go index 132fdd52..ce0e2653 100644 --- a/migration/v14/migrate.go +++ b/migration/v14/migrate.go @@ -54,14 +54,15 @@ func (r Migration) mavenPrefix(db *gorm.DB) (err error) { // In 0.5 task (kinds) added. A task named `analyzer` is // installed by the operator. func (r Migration) taskKind(db *gorm.DB) (err error) { + kind := "analyzer" var list []*model.Task err = db.Find(&list).Error if err != nil { return } for _, m := range list { - if m.Kind == "" { - m.Kind = m.Addon + if m.Addon == kind && m.Kind == "" { + m.Kind = kind } err = db.Save(m).Error if err != nil {