fix: merge conflict

Author: fiftin

.dredd/hooks/helpers.go

@@ -222,7 +222,7 @@ func addTask() *db.Task {
 
 	if err != nil {
 		fmt.Println("error during insertion of task:")
-		if j, err := json.Marshal(t); err == nil {
+		if j, e := json.Marshal(t); e == nil {
 			fmt.Println(string(j))
 		} else {
 			fmt.Println("can not stringify task object")

api-docs.yml

@@ -713,20 +713,29 @@ definitions:
         type: integer
       status:
         type: string
-      debug:
-        type: boolean
       playbook:
         type: string
       environment:
         type: string
       secret:
         type: string
-      limit:
-        type: string
       git_branch:
         type:
           - string
           - 'null'
+      limit:
+        type: string
+      params:
+        type: object
+        properties:
+          debug:
+            type: boolean
+          dry_run:
+            type: boolean
+          diff:
+            type: boolean
+          limit:
+            type: array
       message:
         type: string
 

db/Task.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/semaphoreui/semaphore/pkg/tz"
@@ -74,6 +75,9 @@ type Task struct {
 	InventoryID *int `db:"inventory_id" json:"inventory_id,omitempty"`
 
 	Params MapStringAnyField `db:"params" json:"params,omitempty"`
+
+	// Limit is deprecated, use Params.Limit instead
+	Limit string `db:"-" json:"limit"`
 }
 
 func (task *Task) FillParams(target any) (err error) {
@@ -85,9 +89,27 @@ func (task *Task) FillParams(target any) (err error) {
 	return
 }
 
+// PreInsert is a hook which is called before inserting task into database.
+// Called directly in BoltDB implementation.
 func (task *Task) PreInsert(gorp.SqlExecutor) error {
 	task.Created = tz.In(task.Created)
 
+	if _, ok := task.Params["limit"]; !ok {
+		if task.Params == nil {
+			task.Params = make(MapStringAnyField)
+		}
+
+		if task.Limit != "" {
+			limits := strings.Split(task.Limit, ",")
+
+			for i := range limits {
+				limits[i] = strings.TrimSpace(limits[i])
+			}
+
+			task.Params["limit"] = limits
+		}
+	}
+
 	return nil
 }
 

db/bolt/task.go

@@ -2,7 +2,6 @@ package bolt
 
 import (
 	"github.com/semaphoreui/semaphore/db"
-	"github.com/semaphoreui/semaphore/pkg/tz"
 	"go.etcd.io/bbolt"
 	"time"
 )
@@ -91,7 +90,11 @@ func (d *BoltDb) clearTasks(projectID int, templateID int, maxTasks int) {
 }
 
 func (d *BoltDb) CreateTask(task db.Task, maxTasks int) (newTask db.Task, err error) {
-	task.Created = tz.Now()
+	err = task.PreInsert(nil)
+	if err != nil {
+		return
+	}
+
 	task.ID = 0
 	res, err := d.createObject(0, db.TaskProps, task)
 	if err != nil {

deployment/docker/runner/Dockerfile

@@ -86,6 +86,8 @@ RUN apk add --no-cache -U python3-dev build-base openssl-dev libffi-dev cargo &&
      find ${ANSIBLE_VENV_PATH} -iname __pycache__ | xargs rm -rf && \
      chown -R semaphore:0 /opt/semaphore
 
+RUN echo 'Host *\n  StrictHostKeyChecking no\n  UserKnownHostsFile /dev/null' > /etc/ssh/ssh_config.d/semaphore.conf
+
 USER 1001
 
 ENV VIRTUAL_ENV="$ANSIBLE_VENV_PATH"

deployment/docker/server/Dockerfile

@@ -63,6 +63,8 @@ RUN apk add --no-cache -U \
     chown -R semaphore:0 /opt/semaphore && \
     find /usr/lib/python* -iname __pycache__ | xargs rm -rf
 
+RUN echo $'Host *\n  StrictHostKeyChecking no\n  UserKnownHostsFile /dev/null' > /etc/ssh/ssh_config.d/semaphore.conf
+
 COPY --chown=1001:0 ./deployment/docker/server/ansible.cfg /etc/ansible/ansible.cfg
 COPY --from=builder /go/src/semaphore/deployment/docker/server/server-wrapper /usr/local/bin/
 COPY --from=builder /go/src/semaphore/bin/semaphore /usr/local/bin/

deployment/docker/server/ansible.cfg

@@ -1,7 +1,4 @@
 [defaults]
 host_key_checking = False
 bin_ansible_callbacks = True
-stdout_callback = yaml
-
-[ssh_connection]
-ssh_args = -o UserKnownHostsFile=/dev/null
+stdout_callback = yaml

openapi.yml

@@ -1556,22 +1556,29 @@ paths:
               properties:
                 template_id:
                   type: integer
-                debug:
-                  type: boolean
-                dry_run:
-                  type: boolean
-                diff:
-                  type: boolean
                 playbook:
                   type: string
                 environment:
                   type: string
-                limit:
-                  type: string
                 git_branch:
                   type: string
                 message:
                   type: string
+                limit:
+                  type: string
+                  deprecated: true
+                params:
+                  type: object
+                  properties:
+                    debug:
+                      type: boolean
+                    dry_run:
+                      type: boolean
+                    diff:
+                      type: boolean
+                    limit:
+                      type: array
+
         required: true
       responses:
         '201':

services/tasks/LocalJob.go

@@ -425,15 +425,15 @@ func (t *LocalJob) getPlaybookArgs(username string, incomingVersion *string) (ar
 
 	// Fill fields from task
 
-	if tplParams.AllowOverrideLimit {
+	if tplParams.AllowOverrideLimit && params.Limit != nil {
 		limit = strings.Join(params.Limit, ",")
 	}
 
-	if tplParams.AllowOverrideTags {
+	if tplParams.AllowOverrideTags && params.Tags != nil {
 		tags = strings.Join(params.Tags, ",")
 	}
 
-	if tplParams.AllowOverrideSkipTags {
+	if tplParams.AllowOverrideSkipTags && params.SkipTags != nil {
 		skipTags = strings.Join(params.SkipTags, ",")
 	}