PAASCOMMON-39: Исправить ошибку с импортом ролей в семафоре

Author: Zverev Sergei Evgenevich

db/Task.go

@@ -12,8 +12,7 @@ import (
 	"github.com/semaphoreui/semaphore/util"
 )
 
-type DefaultTaskParams struct {
-}
+type DefaultTaskParams struct{}
 
 type TerraformTaskParams struct {
 	Plan        bool `json:"plan"`
@@ -27,6 +26,7 @@ type AnsibleTaskParams struct {
 	Debug  bool `json:"debug"`
 	DryRun bool `json:"dry_run"`
 	Diff   bool `json:"diff"`
+	TaskID int
 }
 
 // Task is a model of a task which will be executed by the runner
@@ -123,7 +123,6 @@ func (task *Task) GetIncomingVersion(d Store) *string {
 	}
 
 	buildTask, err := d.GetTask(task.ProjectID, *task.BuildTaskID)
-
 	if err != nil {
 		return nil
 	}
@@ -150,7 +149,6 @@ func (task *Task) GetUrl() *string {
 }
 
 func (task *Task) ValidateNewTask(template Template) error {
-
 	var params interface{}
 	switch template.App {
 	case AppAnsible:

db_lib/AnsibleApp.go

@@ -2,13 +2,15 @@ package db_lib
 
 import (
 	"crypto/md5"
+	"errors"
 	"fmt"
 	"io"
 	"os"
 	"path"
 
 	"github.com/semaphoreui/semaphore/db"
 	"github.com/semaphoreui/semaphore/pkg/task_logger"
+	"github.com/semaphoreui/semaphore/util"
 )
 
 func getMD5Hash(filepath string) (string, error) {
@@ -45,7 +47,7 @@ func writeMD5Hash(requirementsFile string, requirementsHashFile string) error {
 		return err
 	}
 
-	return os.WriteFile(requirementsHashFile, []byte(newFileMD5Hash), 0644)
+	return os.WriteFile(requirementsHashFile, []byte(newFileMD5Hash), 0o644)
 }
 
 type AnsibleApp struct {
@@ -69,29 +71,76 @@ func (t *AnsibleApp) Log(msg string) {
 	t.Logger.Log(msg)
 }
 
-func (t *AnsibleApp) InstallRequirements(environmentVars []string, params interface{}) error {
+func (t *AnsibleApp) getRepoPath() string {
+	repo := GitRepository{
+		Logger:     t.Logger,
+		TemplateID: t.Template.ID,
+		Repository: t.Repository,
+		Client:     CreateDefaultGitClient(),
+	}
+
+	return repo.GetFullPath()
+}
+
+func (t *AnsibleApp) installRequirementsForPersonalTask(taskID int) error {
+	if err := t.installGalaxyRequirementsFileForPersonalTask(GalaxyRole, taskID); err != nil {
+		return err
+	}
+	if err := t.installGalaxyRequirementsFileForPersonalTask(GalaxyCollection, taskID); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (t *AnsibleApp) installRequirements() error {
 	if err := t.installCollectionsRequirements(); err != nil {
 		return err
 	}
 	if err := t.installRolesRequirements(); err != nil {
 		return err
 	}
+
 	return nil
 }
 
-func (t *AnsibleApp) getRepoPath() string {
-	repo := GitRepository{
-		Logger:     t.Logger,
-		TemplateID: t.Template.ID,
-		Repository: t.Repository,
-		Client:     CreateDefaultGitClient(),
+func (t *AnsibleApp) InstallRequirements(environmentVars []string, params interface{}) error {
+	if !util.Config.UsePersonalTaskRoles {
+		return t.installRequirements()
 	}
 
-	return repo.GetFullPath()
+	ansibleParams, ok := params.(*db.AnsibleTaskParams)
+	if !ok {
+		return errors.New("undefined type task parameters")
+	}
+
+	return t.installRequirementsForPersonalTask(ansibleParams.TaskID)
 }
 
-func (t *AnsibleApp) installGalaxyRequirementsFile(requirementsType GalaxyRequirementsType, requirementsFilePath string) error {
+func (t *AnsibleApp) installGalaxyRequirementsFileForPersonalTask(requirementsType GalaxyRequirementsType, taskID int) error {
+	requirementsFilePath := path.Join(t.GetPlaybookDir(), string(requirementsType)+"s", "requirements.yml")
+
+	if _, err := os.Stat(requirementsFilePath); err != nil {
+		t.Log("No " + requirementsFilePath + " file found. Skip galaxy install process.\n")
+		return nil
+	}
 
+	if err := t.runGalaxy([]string{
+		string(requirementsType),
+		"install",
+		"-r",
+		requirementsFilePath,
+		"--force",
+		"-p",
+		util.Config.FullPathToPersonalTaskRoles(taskID),
+	}); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (t *AnsibleApp) installGalaxyRequirementsFile(requirementsType GalaxyRequirementsType, requirementsFilePath string) error {
 	requirementsHashFilePath := fmt.Sprintf("%s.md5", requirementsFilePath)
 
 	if _, err := os.Stat(requirementsFilePath); err != nil {

services/tasks/LocalJob.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"maps"
 	"os"
-
 	"path"
 	"strconv"
 
@@ -58,7 +57,6 @@ func (t *LocalJob) SetCommit(hash, message string) {
 }
 
 func (t *LocalJob) getEnvironmentExtraVars(username string, incomingVersion *string) (extraVars map[string]interface{}, err error) {
-
 	extraVars = make(map[string]interface{})
 
 	if t.Environment.JSON != "" {
@@ -178,7 +176,6 @@ func (t *LocalJob) getEnvironmentENV() (res []string, err error) {
 // nolint: gocyclo
 func (t *LocalJob) getShellArgs(username string, incomingVersion *string) (args []string, err error) {
 	extraVars, err := t.getEnvironmentExtraVars(username, incomingVersion)
-
 	if err != nil {
 		t.Log(err.Error())
 		t.Log("Error getting environment extra vars")
@@ -219,11 +216,9 @@ func (t *LocalJob) getShellArgs(username string, incomingVersion *string) (args
 
 // nolint: gocyclo
 func (t *LocalJob) getTerraformArgs(username string, incomingVersion *string) (args []string, err error) {
-
 	args = []string{}
 
 	extraVars, err := t.getEnvironmentExtraVars(username, incomingVersion)
-
 	if err != nil {
 		t.Log(err.Error())
 		t.Log("Could not remove command environment, if existent it will be passed to --extra-vars. This is not fatal but be aware of side effects")
@@ -268,7 +263,6 @@ func (t *LocalJob) getTerraformArgs(username string, incomingVersion *string) (a
 
 // nolint: gocyclo
 func (t *LocalJob) getPlaybookArgs(username string, incomingVersion *string) (args []string, inputs map[string]string, err error) {
-
 	inputMap := make(map[db.AccessKeyRole]string)
 	inputs = make(map[string]string)
 
@@ -405,7 +399,6 @@ func (t *LocalJob) getPlaybookArgs(username string, incomingVersion *string) (ar
 }
 
 func (t *LocalJob) getCLIArgs() (templateArgs []string, taskArgs []string, err error) {
-
 	if t.Template.Arguments != nil {
 		err = json.Unmarshal([]byte(*t.Template.Arguments), &templateArgs)
 		if err != nil {
@@ -428,15 +421,16 @@ func (t *LocalJob) getCLIArgs() (templateArgs []string, taskArgs []string, err e
 func (t *LocalJob) getParams() (params interface{}, err error) {
 	switch t.Template.App {
 	case db.AppAnsible:
-		params = &db.AnsibleTaskParams{}
+		params = &db.AnsibleTaskParams{
+			TaskID: t.Task.ID,
+		}
 	case db.AppTerraform, db.AppTofu:
 		params = &db.TerraformTaskParams{}
 	default:
 		params = &db.DefaultTaskParams{}
 	}
 
 	err = t.Task.FillParams(params)
-
 	if err != nil {
 		return
 	}
@@ -445,10 +439,13 @@ func (t *LocalJob) getParams() (params interface{}, err error) {
 }
 
 func (t *LocalJob) Run(username string, incomingVersion *string, alias string) (err error) {
-
 	defer func() {
 		t.destroyKeys()
 		t.destroyInventoryFile()
+
+		if util.Config.UsePersonalTaskRoles {
+			t.destroyTaskRoles()
+		}
 	}()
 
 	t.SetStatus(task_logger.TaskRunningStatus) // It is required for local mode. Don't delete
@@ -458,6 +455,11 @@ func (t *LocalJob) Run(username string, incomingVersion *string, alias string) (
 		return
 	}
 
+	if util.Config.UsePersonalTaskRoles {
+		environmentVariables = append(environmentVariables,
+			fmt.Sprintf("ANSIBLE_ROLES_PATH=%s", util.Config.FullPathToPersonalTaskRoles(t.Task.ID)))
+	}
+
 	params, err := t.getParams()
 	if err != nil {
 		return
@@ -518,11 +520,9 @@ func (t *LocalJob) Run(username string, incomingVersion *string, alias string) (
 			t.Process = p
 		},
 	})
-
 }
 
 func (t *LocalJob) prepareRun(environmentVars []string, params interface{}) error {
-
 	t.Log("Preparing: " + strconv.Itoa(t.Task.ID))
 
 	if err := checkTmpDir(util.Config.TmpPath); err != nil {
@@ -583,7 +583,6 @@ func (t *LocalJob) updateRepository() error {
 	}
 
 	err := repo.ValidateRepo()
-
 	if err != nil {
 		if !os.IsNotExist(err) {
 			err = os.RemoveAll(repo.GetFullPath())
@@ -610,7 +609,6 @@ func (t *LocalJob) updateRepository() error {
 }
 
 func (t *LocalJob) checkoutRepository() error {
-
 	repo := db_lib.GitRepository{
 		Logger:     t.Logger,
 		TemplateID: t.Template.ID,
@@ -619,7 +617,6 @@ func (t *LocalJob) checkoutRepository() error {
 	}
 
 	err := repo.ValidateRepo()
-
 	if err != nil {
 		return err
 	}
@@ -632,7 +629,6 @@ func (t *LocalJob) checkoutRepository() error {
 	// store commit to TaskRunner table
 
 	commitHash, err := repo.GetLastCommitHash()
-
 	if err != nil {
 		return err
 	}

services/tasks/LocalJob_inventory.go

@@ -84,7 +84,7 @@ func (t *LocalJob) installStaticInventory() error {
 	fullPath := t.tmpInventoryFullPath()
 
 	// create inventory file
-	return os.WriteFile(fullPath, []byte(t.Inventory.Inventory), 0664)
+	return os.WriteFile(fullPath, []byte(t.Inventory.Inventory), 0o664)
 }
 
 func (t *LocalJob) destroyInventoryFile() {
@@ -94,6 +94,13 @@ func (t *LocalJob) destroyInventoryFile() {
 	}
 }
 
+func (t *LocalJob) destroyTaskRoles() {
+	fullPath := util.Config.FullPathToPersonalTaskRoles(t.Task.ID)
+	if err := os.RemoveAll(fullPath); err != nil {
+		log.Error(err)
+	}
+}
+
 func (t *LocalJob) destroyKeys() {
 	err := t.sshKeyInstallation.Destroy()
 	if err != nil {