Merge pull request #2462 from actiontech/issue-ee-1592

Reduce code duplication
actiontech · Jun 20, 2024 · eef2294 · eef2294
2 parents 784700a + 2c41ac8
commit eef2294
Showing 1 changed file with 3 additions and 17 deletions.
diff --git a/sqle/server/auditplan/task.go b/sqle/server/auditplan/task.go
@@ -262,23 +262,9 @@ func NewDefaultTask(entry *logrus.Entry, ap *model.AuditPlan) Task {
 }
 
 func (at *DefaultTask) Audit() (*AuditResultResp, error) {
-	var task *model.Task
-	if at.ap.InstanceName == "" {
-		task = &model.Task{
-			DBType: at.ap.DBType,
-		}
-	} else {
-		ctx, cancel := context.WithTimeout(context.Background(), time.Second*20)
-		defer cancel()
-		instance, _, err := dms.GetInstanceInProjectByName(ctx, string(at.ap.ProjectId), at.ap.InstanceName)
-		if err != nil {
-			return nil, err
-		}
-		task = &model.Task{
-			Instance: instance,
-			Schema:   at.ap.InstanceDatabase,
-			DBType:   at.ap.DBType,
-		}
+	task, err := getTaskWithInstanceByAuditPlan(at.ap, at.persist)
+	if err != nil {
+		return nil, err
 	}
 	return at.baseTask.audit(task)
 }