ADMIN-3023 add task slugs

.gitignore

@@ -17,3 +17,5 @@ util/version.go
 /coverage.out
 /public/package-lock.json
 !.gitkeep
+
+.dredd/compiled_hooks

CONTRIBUTING.md

@@ -96,10 +96,8 @@ This means that you should never run these tests against your productive databas
 The best practice to run these tests is to use docker and the task commands.
 
 ```bash
-task dc:build #First run only to build the images
-context=dev task dc:up
-task test:api
-# alternatively if you want to run dredd in a container use the following command.
-# You will need to use the host network so that it can reach the docker container on a 0.0.0.0 address
-# docker run -it --rm -v $(pwd):/home/developer/src --network host tomwhiston/dredd --config .dredd/dredd.yml
+context=dev task dc:build #build fresh semaphore images
+context=dev task dc:up  #up semaphore and mysql
+task dc:build:dredd #build fresh dredd image
+task dc:up:dredd #run dredd over docker-compose stack
 ```

Gopkg.toml

@@ -4,7 +4,7 @@
 
 [[constraint]]
   branch = "master"
-  name = "github.com/castawaylabs/mulekick"
+  name = "github.com/strangeman/mulekick"
 
 [[constraint]]
   name = "github.com/go-sql-driver/mysql"
@@ -58,6 +58,10 @@
   name = "gopkg.in/ldap.v2"
   version = "2.5.1"
 
+[[constraint]]
+  name = "github.com/tjarratt/babble"
+  branch = "master"
+
 [prune]
   go-tests = true
   unused-packages = true

Taskfile.yml

@@ -100,7 +100,7 @@ tasks:
         sh: git rev-parse --abbrev-ref HEAD
       DIRTY:
         # We must exclude the package-lock file as npm install can change it!
-        sh: git diff --exit-code --stat -- . ':(exclude)web/package-lock.json' ':(exclude)web/package.json'
+        sh: git diff --exit-code --stat -- . ':(exclude)web/package-lock.json' ':(exclude)web/package.json' ':(exclude)deployment/*' ':(exclude)Taskfile*'
       SHA:
         sh: git log --pretty=format:'%h' -n 1
       TIMESTAMP:
@@ -241,6 +241,27 @@ tasks:
           args: stop
           context: "{{ .context }}"
 
+  dc:build:dredd:
+    desc: build a dredd container to the local testing with docker-compose stack
+    cmds:
+      - task: docker
+        vars:
+          context: dev
+          compose: true
+          prefix: -dredd
+          args: build
+
+  dc:up:dredd:
+    desc: build a dredd container to the local testing with docker-compose stack
+    cmds:
+      - task: docker
+        vars:
+          context: dev
+          compose: true
+          prefix: -dredd
+          args: up
+
+
   docker:build:
     desc: Build an image for Semaphore, requires context
     vars:
@@ -302,4 +323,4 @@ tasks:
     vars:
       docker_root: deployment/docker/
     cmds:
-      - docker{{ if .compose }}-compose{{ end }} {{ if .action }}{{ .action }}{{ end }} -f {{ .docker_root }}{{ .context }}/{{ if .compose }}docker-compose.yml{{ else }}Dockerfile{{ end }} {{if .args }}{{ .args }}{{ end }}
+      - docker{{ if .compose }}-compose{{ end }} {{ if .action }}{{ .action }}{{ end }} -f {{ .docker_root }}{{ .context }}/{{ if .compose }}docker-compose{{ if .prefix }}{{ .prefix }}{{ end }}.yml{{ else }}Dockerfile{{ if .prefix }}{{ .prefix }}{{ end }}{{ end }} {{if .args }}{{ .args }}{{ end }}

api-docs.yml

@@ -287,6 +287,8 @@ definitions:
       environment_id:
         type: integer
         minimum: 1
+      slug:
+        type: string
       alias:
         type: string
       playbook:
@@ -301,6 +303,8 @@ definitions:
       id:
         type: integer
         minimum: 1
+      slug:
+        type: string
       ssh_key_id:
         type: integer
         minimum: 1
@@ -424,6 +428,13 @@ parameters:
     type: integer
     required: true
     x-example: 8
+  slug:
+    name: slug
+    description: Slug
+    in: path
+    type: string
+    required: true
+    x-example: some-task
 
 paths:
   /ping:
@@ -451,7 +462,7 @@ paths:
       responses:
         200:
           description: OK
-        403:
+        401:
           description: not authenticated
 
   /info:
@@ -1213,6 +1224,34 @@ paths:
           description: Task queued
           schema:
             $ref: "#/definitions/Task"
+  /project/{project_id}/slug/{slug}:
+    parameters:
+      - $ref: "#/parameters/project_id"
+      - $ref: "#/parameters/slug"
+    post:
+      tags:
+        - project
+      summary: Starts a job via task slug
+      parameters:
+        - name: task
+          in: body
+          required: true
+          schema:
+            type: object
+            properties:
+              debug:
+                type: boolean
+              dry_run:
+                type: boolean
+              playbook:
+                type: string
+              environment:
+                type: string
+      responses:
+        201:
+          description: Task queued
+          schema:
+            $ref: "#/definitions/Task"
   /project/{project_id}/tasks/last:
     parameters:
       - $ref: "#/parameters/project_id"

api/auth.go

@@ -20,7 +20,7 @@ func authentication(w http.ResponseWriter, r *http.Request) {
 		var token db.APIToken
 		if err := db.Mysql.SelectOne(&token, "select * from user__token where id=? and expired=0", strings.Replace(authHeader, "bearer ", "", 1)); err != nil {
 			if err == sql.ErrNoRows {
-				w.WriteHeader(http.StatusForbidden)
+				w.WriteHeader(http.StatusUnauthorized)
 				return
 			}
 
@@ -32,20 +32,20 @@ func authentication(w http.ResponseWriter, r *http.Request) {
 		// fetch session from cookie
 		cookie, err := r.Cookie("semaphore")
 		if err != nil {
-			w.WriteHeader(http.StatusForbidden)
+			w.WriteHeader(http.StatusUnauthorized)
 			return
 		}
 
 		value := make(map[string]interface{})
 		if err = util.Cookie.Decode("semaphore", cookie.Value, &value); err != nil {
-			w.WriteHeader(http.StatusForbidden)
+			w.WriteHeader(http.StatusUnauthorized)
 			return
 		}
 
 		user, ok := value["user"]
 		sessionVal, okSession := value["session"]
 		if !ok || !okSession {
-			w.WriteHeader(http.StatusForbidden)
+			w.WriteHeader(http.StatusUnauthorized)
 			return
 		}
 
@@ -55,7 +55,7 @@ func authentication(w http.ResponseWriter, r *http.Request) {
 		// fetch session
 		var session db.Session
 		if err := db.Mysql.SelectOne(&session, "select * from session where id=? and user_id=? and expired=0", sessionID, userID); err != nil {
-			w.WriteHeader(http.StatusForbidden)
+			w.WriteHeader(http.StatusUnauthorized)
 			return
 		}
 
@@ -66,7 +66,7 @@ func authentication(w http.ResponseWriter, r *http.Request) {
 				panic(err)
 			}
 
-			w.WriteHeader(http.StatusForbidden)
+			w.WriteHeader(http.StatusUnauthorized)
 			return
 		}
 
@@ -78,7 +78,7 @@ func authentication(w http.ResponseWriter, r *http.Request) {
 	user, err := db.FetchUser(userID)
 	if err != nil {
 		fmt.Println("Can't find user", err)
-		w.WriteHeader(http.StatusForbidden)
+		w.WriteHeader(http.StatusUnauthorized)
 		return
 	}
 

api/events.go

@@ -4,10 +4,10 @@ import (
 	"net/http"
 
 	"github.com/ansible-semaphore/semaphore/db"
-	"github.com/castawaylabs/mulekick"
+	"github.com/ansible-semaphore/semaphore/util"
 	"github.com/gorilla/context"
 	"github.com/masterminds/squirrel"
-	"github.com/ansible-semaphore/semaphore/util"
+	"github.com/strangeman/mulekick"
 )
 
 //nolint: gocyclo

api/login.go

@@ -12,7 +12,7 @@ import (
 	log "github.com/Sirupsen/logrus"
 	"github.com/ansible-semaphore/semaphore/db"
 	"github.com/ansible-semaphore/semaphore/util"
-	"github.com/castawaylabs/mulekick"
+	"github.com/strangeman/mulekick"
 	sq "github.com/masterminds/squirrel"
 	"golang.org/x/crypto/bcrypt"
 	"gopkg.in/ldap.v2"

api/projects/environment.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/ansible-semaphore/semaphore/db"
 	"github.com/ansible-semaphore/semaphore/util"
-	"github.com/castawaylabs/mulekick"
 	"github.com/gorilla/context"
 	"github.com/masterminds/squirrel"
+	"github.com/strangeman/mulekick"
 )
 
 // EnvironmentMiddleware ensures an environment exists and loads it to the context

api/projects/inventory.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/ansible-semaphore/semaphore/db"
 	"github.com/ansible-semaphore/semaphore/util"
-	"github.com/castawaylabs/mulekick"
+	"github.com/strangeman/mulekick"
 	"github.com/gorilla/context"
 	"github.com/masterminds/squirrel"
 	"path/filepath"

api/projects/keys.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/ansible-semaphore/semaphore/db"
 	"github.com/ansible-semaphore/semaphore/util"
-	"github.com/castawaylabs/mulekick"
+	"github.com/strangeman/mulekick"
 	"github.com/gorilla/context"
 	"github.com/masterminds/squirrel"
 )

api/projects/project.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/ansible-semaphore/semaphore/db"
 	"github.com/ansible-semaphore/semaphore/util"
-	"github.com/castawaylabs/mulekick"
+	"github.com/strangeman/mulekick"
 	"github.com/gorilla/context"
 	"github.com/masterminds/squirrel"
 )

api/projects/projects.go

@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"github.com/ansible-semaphore/semaphore/db"
-	"github.com/castawaylabs/mulekick"
+	"github.com/strangeman/mulekick"
 	"github.com/gorilla/context"
 	"github.com/masterminds/squirrel"
 	"time"

api/projects/repository.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/ansible-semaphore/semaphore/db"
 	"github.com/ansible-semaphore/semaphore/util"
-	"github.com/castawaylabs/mulekick"
+	"github.com/strangeman/mulekick"
 	"github.com/gorilla/context"
 	"github.com/masterminds/squirrel"
 )