refactor: move ansible parser to pro

Author: fiftin

cli/cmd/root.go

@@ -119,6 +119,7 @@ func runService() {
 	fmt.Printf("Port %v\n", util.Config.Port)
 
 	subscriptionService.StartValidationCron()
+
 	go sockets.StartWS()
 	go schedulePool.Run()
 	go taskPool.Run()

db/Store.go

@@ -375,16 +375,19 @@ type TaskManager interface {
 	CreateTaskStage(stage TaskStage) (TaskStage, error)
 	EndTaskStage(taskID int, stageID int, end time.Time, endOutputID int) error
 	CreateTaskStageResult(taskID int, stageID int, result map[string]any) error
-	CreateAnsibleTaskHost(host AnsibleTaskHost) error
-	CreateAnsibleTaskError(error AnsibleTaskError) error
-	GetAnsibleTaskHosts(projectID int, taskID int) ([]AnsibleTaskHost, error)
-	GetAnsibleTaskErrors(projectID int, taskID int) ([]AnsibleTaskError, error)
 	GetTaskStages(projectID int, taskID int) ([]TaskStageWithResult, error)
 	GetTaskStageResult(projectID int, taskID int, stageID int) (TaskStageResult, error)
 	GetTaskStageOutputs(projectID int, taskID int, stageID int) ([]TaskOutput, error)
 	GetTaskStats(projectID int, templateID *int, unit TaskStatUnit, filter TaskFilter) ([]TaskStat, error)
 }
 
+type AnsibleTaskRepository interface {
+	CreateAnsibleTaskHost(host AnsibleTaskHost) error
+	CreateAnsibleTaskError(error AnsibleTaskError) error
+	GetAnsibleTaskHosts(projectID int, taskID int) ([]AnsibleTaskHost, error)
+	GetAnsibleTaskErrors(projectID int, taskID int) ([]AnsibleTaskError, error)
+}
+
 // ScheduleManager handles schedule-related operations
 type ScheduleManager interface {
 	GetSchedules() ([]Schedule, error)
@@ -456,6 +459,7 @@ type Store interface {
 	SessionManager
 	TokenManager
 	TaskManager
+	AnsibleTaskRepository
 	ScheduleManager
 	ViewManager
 	RunnerManager

db/Template_alias.go

@@ -3,5 +3,5 @@
 package db
 
 func (t TemplateApp) NeedTaskAlias() bool {
-	return false
+	return t.IsTerraform()
 }

db/bolt/ansible_pro.go

@@ -0,0 +1,26 @@
+//go:build pro
+
+package bolt
+
+import (
+	"github.com/pkg/errors"
+	"github.com/semaphoreui/semaphore/db"
+)
+
+func (d *BoltDb) CreateAnsibleTaskHost(host db.AnsibleTaskHost) error {
+	return errors.New("not implemented")
+}
+
+func (d *BoltDb) CreateAnsibleTaskError(error db.AnsibleTaskError) error {
+	return errors.New("not implemented")
+}
+
+func (d *BoltDb) GetAnsibleTaskHosts(projectID int, taskID int) (res []db.AnsibleTaskHost, err error) {
+	err = errors.New("not implemented")
+	return
+}
+
+func (d *BoltDb) GetAnsibleTaskErrors(projectID int, taskID int) (res []db.AnsibleTaskError, err error) {
+	err = errors.New("not implemented")
+	return
+}

db/bolt/runner_pro.go

@@ -0,0 +1,81 @@
+//go:build pro
+
+package bolt
+
+import (
+	"fmt"
+	"github.com/semaphoreui/semaphore/db"
+	"go.etcd.io/bbolt"
+)
+
+func (d *BoltDb) GetRunner(projectID int, runnerID int) (runner db.Runner, err error) {
+	err = d.getObject(0, db.GlobalRunnerProps, intObjectID(runnerID), &runner)
+	if err != nil {
+		return
+	}
+
+	if runner.ProjectID == nil || *runner.ProjectID != projectID {
+		err = db.ErrNotFound
+	}
+
+	return
+}
+
+func validateTag(tag string) error {
+	if tag == "" {
+		return fmt.Errorf("tag cannot be empty")
+	}
+
+	return nil
+}
+
+func (d *BoltDb) GetRunners(projectID int, activeOnly bool, tag *string) (runners []db.Runner, err error) {
+	if tag != nil {
+		err = validateTag(*tag)
+		if err != nil {
+			return
+		}
+	}
+
+	runners = make([]db.Runner, 0)
+	err = d.getObjects(0, db.GlobalRunnerProps, db.RetrieveQueryParams{}, func(i interface{}) bool {
+		runner := i.(db.Runner)
+
+		if runner.ProjectID == nil || *runner.ProjectID != projectID {
+			return false
+		}
+
+		if tag != nil && runner.Tag != *tag {
+			return false
+		}
+
+		if activeOnly {
+			return runner.Active
+		}
+
+		return true
+	}, &runners)
+	return
+}
+
+func (d *BoltDb) DeleteRunner(projectID int, runnerID int) error {
+	return d.db.Update(func(tx *bbolt.Tx) error {
+		runner, err := d.GetRunner(projectID, runnerID)
+		if err != nil {
+			return err
+		}
+		if runner.ProjectID == nil || *runner.ProjectID != projectID {
+			return db.ErrNotFound
+		}
+		return d.deleteObject(0, db.GlobalRunnerProps, intObjectID(runnerID), tx)
+	})
+}
+
+func (d *BoltDb) GetRunnerTags(projectID int) ([]db.RunnerTag, error) {
+	return []db.RunnerTag{
+		{
+			Tag:             "tag1",
+			NumberOfRunners: 1,
+		},
+	}, nil
+}

db/bolt/runner_pro_test.go

@@ -0,0 +1,23 @@
+package bolt
+
+import (
+	"github.com/semaphoreui/semaphore/db"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func Test_DeleteRunner_DeletesProjectRunner(t *testing.T) {
+	store := CreateTestStore()
+
+	project, err := store.CreateProject(db.Project{})
+	assert.NoError(t, err)
+
+	testRunner, err := store.CreateRunner(db.Runner{ProjectID: &project.ID})
+	assert.NoError(t, err)
+
+	err = store.DeleteRunner(project.ID, testRunner.ID)
+	assert.NoError(t, err)
+
+	_, err = store.GetRunner(project.ID, testRunner.ID)
+	assert.ErrorIs(t, err, db.ErrNotFound)
+}

db/sql/ansible_pro.go

@@ -0,0 +1,75 @@
+//go:build pro
+
+package sql
+
+import (
+	"github.com/Masterminds/squirrel"
+	"github.com/semaphoreui/semaphore/db"
+)
+
+func (d *SqlDb) CreateAnsibleTaskHost(host db.AnsibleTaskHost) error {
+	_, err := d.exec(
+		"insert into task__ansible_host (project_id, task_id, host, failed, changed, ignored, ok, rescued, skipped, unreachable) "+
+			"values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+		host.ProjectID,
+		host.TaskID,
+		host.Host,
+		host.Failed,
+		host.Changed,
+		host.Ignored,
+		host.Ok,
+		host.Rescued,
+		host.Skipped,
+		host.Unreachable,
+	)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (d *SqlDb) CreateAnsibleTaskError(error db.AnsibleTaskError) error {
+	_, err := d.exec(
+		"insert into task__ansible_error (project_id, task_id, host, task, error) "+
+			"values (?, ?, ?, ?, ?)",
+		error.ProjectID,
+		error.TaskID,
+		error.Host,
+		error.Task,
+		error.Error,
+	)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (d *SqlDb) GetAnsibleTaskHosts(projectID int, taskID int) (res []db.AnsibleTaskHost, err error) {
+	q := squirrel.Select("*").
+		From("task__ansible_host").
+		Where("project_id=? and task_id=?", projectID, taskID)
+
+	query, args, err := q.ToSql()
+
+	if err != nil {
+		return
+	}
+
+	_, err = d.selectAll(&res, query, args...)
+	return
+}
+
+func (d *SqlDb) GetAnsibleTaskErrors(projectID int, taskID int) (res []db.AnsibleTaskError, err error) {
+	q := squirrel.Select("*").
+		From("task__ansible_error").
+		Where("project_id=? and task_id=?", projectID, taskID)
+
+	query, args, err := q.ToSql()
+
+	if err != nil {
+		return
+	}
+
+	_, err = d.selectAll(&res, query, args...)
+	return
+}

db/sql/runner.go

@@ -1,24 +1,56 @@
-//go:build !pro
-
 package sql
 
 import (
+	"fmt"
 	"github.com/Masterminds/squirrel"
 	"github.com/semaphoreui/semaphore/db"
 )
 
+func validateTag(tag string) error {
+	if tag == "" {
+		return fmt.Errorf("Tag cannot be empty")
+	}
+
+	return nil
+}
+
+func makePropsNonGlobal(props db.ObjectProps) (res db.ObjectProps) {
+	res = props
+	res.IsGlobal = false
+	return
+}
+
+var runnerProps = makePropsNonGlobal(db.GlobalRunnerProps)
+
 func (d *SqlDb) GetRunner(projectID int, runnerID int) (runner db.Runner, err error) {
-	err = db.ErrNotFound
+	err = d.getObject(projectID, runnerProps, runnerID, &runner)
 	return
 }
 
 func (d *SqlDb) GetRunners(projectID int, activeOnly bool, tag *string) (runners []db.Runner, err error) {
-	runners = make([]db.Runner, 0)
+	if tag != nil {
+		err = validateTag(*tag)
+		if err != nil {
+			return
+		}
+	}
+
+	err = d.getObjects(projectID, runnerProps, db.RetrieveQueryParams{}, func(builder squirrel.SelectBuilder) squirrel.SelectBuilder {
+		if tag != nil {
+			builder = builder.Where("tag=?", *tag)
+		}
+
+		if activeOnly {
+			builder = builder.Where("active=?", activeOnly)
+		}
+
+		return builder
+	}, &runners)
 	return
 }
 
 func (d *SqlDb) DeleteRunner(projectID int, runnerID int) (err error) {
-	err = db.ErrNotFound
+	err = d.deleteObject(projectID, runnerProps, runnerID)
 	return
 }