Skip to content

Commit

Permalink
Revert ":sparkles: Ensure analyzer tasks created prior to upgrade hav…
Browse files Browse the repository at this point in the history
…e kind assigned." (#686)

Reverts #674
  • Loading branch information
shawn-hurley authored Jul 3, 2024
1 parent 59d7248 commit 538c551
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 37 deletions.
2 changes: 1 addition & 1 deletion hack/add/task.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ curl -X POST ${host}/tasks -d \
'{
"name":"Test",
"locator": "app.1.test",
"addon": "analyzer",
"addon": "test",
"application": {"id": 1},
"data": {
"path": "/etc"
Expand Down
37 changes: 1 addition & 36 deletions migration/v14/migrate.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,7 @@ func (r Migration) Apply(db *gorm.DB) (err error) {
if err != nil {
return
}
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) {
// add mvn:// prefix.
prefix := "mvn://"
var list []*model.Application
err = db.Find(&list).Error
Expand All @@ -50,28 +37,6 @@ func (r Migration) mavenPrefix(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) {
kind := "analyzer"
var list []*model.Task
err = db.Find(&list).Error
if err != nil {
return
}
for _, m := range list {
if m.Addon == kind && m.Kind == "" {
m.Kind = kind
}
err = db.Save(m).Error
if err != nil {
return
}
}
return
}

func (r Migration) Models() []any {
return model.All()
}

0 comments on commit 538c551

Please sign in to comment.