Merge branch 'develop' of github.com:rmtsrc/semaphore into prefers-color-scheme

Author: rmtsrc

.codacy.yml

@@ -0,0 +1,3 @@
+---
+exclude_paths:
+  - .dredd/**

.devcontainer/config-runner.json

@@ -0,0 +1,6 @@
+{
+    "web_host": "http://localhost:3000",
+    "runner": {
+        "token_file": "/home/codespace/.semaphore-runner-token"
+    }
+}

.devcontainer/config.json

@@ -0,0 +1,12 @@
+{
+   "bolt": {
+       "host": "/workspaces/semaphore/database.boltdb",
+       "options": {
+           "sessionConnection": "true"
+       }
+   },
+   "dialect": "bolt",
+   "cookie_hash": "5WJjXCLpvf3Cn5t+C/IV9F0asZUQLakOhCT+eSdIwP0=",
+   "cookie_encryption": "6x6mmQWGn6YcsHN1rN0HiQjhYA+7HukcbCxUGHuT2CE="
+}
+

.devcontainer/devcontainer.json

@@ -3,5 +3,6 @@
   "features": {
     "ghcr.io/devcontainers/features/go:1": {},
     "ghcr.io/devcontainers/features/node:1": {}
-  }
+  },
+  "postCreateCommand": "./.devcontainer/postCreateCommand.sh"
 }

.devcontainer/postCreateCommand.sh

@@ -0,0 +1,21 @@
+go install github.com/go-task/task/v3/cmd/task@latest
+
+(cd ./web && npm install)
+
+python3 -m venv .venv
+
+./.venv/bin/pip3 install ansible
+
+task build
+task e2e:goodman
+task e2e:hooks
+
+cp ./.devcontainer/config.json ./.dredd/config.json
+
+./bin/semaphore user add \
+    --admin \
+    --login admin \
+    --name Admin \
+    --email [email protected] \
+    --password changeme \
+    --config ./.devcontainer/config.json

.dockerignore

@@ -0,0 +1,2 @@
+web/node_modules/
+vendor/

.dredd/dredd.dev.yml renamed to .dredd/dredd.docker.yml

@@ -1,8 +1,7 @@
 dry-run: null
 hookfiles: ./.dredd/compiled_hooks
 language: go
-#server: context=dev task dc:up
-server-wait: 240
+server-wait: 5
 init: false
 custom: {}
 names: false
@@ -28,4 +27,4 @@ hooks-worker-handler-host: 0.0.0.0
 hooks-worker-handler-port: 61321
 config: ./.dredd/dredd.yml
 blueprint: api-docs.yml
-endpoint: 'http://semaphore_ci:3000'
+endpoint: 'http://server:3000'

.dredd/dredd.local.yml

@@ -1,8 +1,7 @@
 dry-run: null
 hookfiles: ./.dredd/compiled_hooks
 language: go
-#server: context=dev task dc:up
-server-wait: 240
+server-wait: 5
 init: false
 custom: {}
 names: false

.dredd/dredd.yml renamed to .dredd/dredd.testing.yml

@@ -1,8 +1,8 @@
 dry-run: null
 hookfiles: ./.dredd/compiled_hooks
 language: go
-#server: context=dev task dc:up
-server-wait: 240
+server: ./.dredd/server-wrapper.sh
+server-wait: 5
 init: false
 custom: {}
 names: false
@@ -28,4 +28,4 @@ hooks-worker-handler-host: 0.0.0.0
 hooks-worker-handler-port: 61321
 config: ./.dredd/dredd.yml
 blueprint: api-docs.yml
-endpoint: 'http://semaphore_ci:3000'
+endpoint: 'http://localhost:3000'

.dredd/dredd.windows.yml

@@ -1,8 +1,7 @@
 dry-run: null
 hookfiles: ./.dredd/compiled_hooks.exe
 language: go
-#server: context=dev task dc:up
-server-wait: 240
+server-wait: 5
 init: false
 custom: {}
 names: false

.dredd/hooks/capabilities.go

@@ -2,11 +2,12 @@ package main
 
 import (
 	"encoding/json"
-	"github.com/ansible-semaphore/semaphore/db"
-	trans "github.com/snikch/goodman/transaction"
 	"regexp"
 	"strconv"
 	"strings"
+
+	"github.com/semaphoreui/semaphore/db"
+	trans "github.com/snikch/goodman/transaction"
 )
 
 // STATE
@@ -18,23 +19,32 @@ var userKey *db.AccessKey
 var task *db.Task
 var schedule *db.Schedule
 var view *db.View
+var integration *db.Integration
+var integrationextractvalue *db.IntegrationExtractValue
+var integrationmatch *db.IntegrationMatcher
 
 // Runtime created simple ID values for some items we need to reference in other objects
 var repoID int
 var inventoryID int
 var environmentID int
 var templateID int
+var integrationID int
+var integrationExtractValueID int
+var integrationMatchID int
 
 var capabilities = map[string][]string{
-	"user":        {},
-	"project":     {"user"},
-	"repository":  {"access_key"},
-	"inventory":   {"repository"},
-	"environment": {"repository"},
-	"template":    {"repository", "inventory", "environment", "view"},
-	"task":        {"template"},
-	"schedule":    {"template"},
-	"view":        {},
+	"user":                    {},
+	"project":                 {"user"},
+	"repository":              {"access_key"},
+	"inventory":               {"repository"},
+	"environment":             {"repository"},
+	"template":                {"repository", "inventory", "environment", "view"},
+	"task":                    {"template"},
+	"schedule":                {"template"},
+	"view":                    {},
+	"integration":             {"project", "template"},
+	"integrationextractvalue": {"integration"},
+	"integrationmatcher":      {"integration"},
 }
 
 func capabilityWrapper(cap string) func(t *trans.Transaction) {
@@ -91,17 +101,25 @@ func resolveCapability(caps []string, resolved []string, uid string) {
 			repoID = pRepo.ID
 		case "inventory":
 			res, err := store.CreateInventory(db.Inventory{
-				ProjectID: userProject.ID,
-				Name:      "ITI-" + uid,
-				Type:      "static",
-				SSHKeyID:  &userKey.ID,
-				Inventory: "Test Inventory",
+				ProjectID:    userProject.ID,
+				Name:         "ITI-" + uid,
+				Type:         "static",
+				SSHKeyID:     &userKey.ID,
+				BecomeKeyID:  &userKey.ID,
+				Inventory:    "Test Inventory",
+				RepositoryID: &repoID,
 			})
 			printError(err)
 			inventoryID = res.ID
 		case "environment":
 			pwd := "test-pass"
 			env := "{}"
+			secret := db.EnvironmentSecret{
+				Type:      db.EnvironmentSecretEnv,
+				Name:      "TEST",
+				Secret:    "VALUE",
+				Operation: "create",
+			}
 			res, err := store.CreateEnvironment(db.Environment{
 				ProjectID: userProject.ID,
 				Name:      "ITI-" + uid,
@@ -110,13 +128,22 @@ func resolveCapability(caps []string, resolved []string, uid string) {
 				ENV:       &env,
 			})
 			printError(err)
+			_, err = store.CreateAccessKey(db.AccessKey{
+				Name:          string(secret.Type) + "." + secret.Name,
+				String:        secret.Secret,
+				EnvironmentID: &res.ID,
+				ProjectID:     &userProject.ID,
+				Type:          db.AccessKeyString,
+			})
+			printError(err)
 			environmentID = res.ID
 		case "template":
 			args := "[]"
 			desc := "Hello, World!"
+			branch := "main"
 			res, err := store.CreateTemplate(db.Template{
 				ProjectID:               userProject.ID,
-				InventoryID:             inventoryID,
+				InventoryID:             &inventoryID,
 				RepositoryID:            repoID,
 				EnvironmentID:           &environmentID,
 				Name:                    "Test-" + uid,
@@ -125,12 +152,24 @@ func resolveCapability(caps []string, resolved []string, uid string) {
 				AllowOverrideArgsInTask: false,
 				Description:             &desc,
 				ViewID:                  &view.ID,
+				App:                     db.AppAnsible,
+				GitBranch:               &branch,
+				SurveyVars:              []db.SurveyVar{},
 			})
 
 			printError(err)
 			templateID = res.ID
 		case "task":
 			task = addTask()
+		case "integration":
+			integration = addIntegration()
+			integrationID = integration.ID
+		case "integrationextractvalue":
+			integrationextractvalue = addIntegrationExtractValue()
+			integrationExtractValueID = integrationextractvalue.ID
+		case "integrationmatcher":
+			integrationmatch = addIntegrationMatcher()
+			integrationMatchID = integrationmatch.ID
 		default:
 			panic("unknown capability " + v)
 		}
@@ -150,13 +189,16 @@ var pathSubPatterns = []func() string{
 	func() string { return strconv.Itoa(userProject.ID) },
 	func() string { return strconv.Itoa(userPathTestUser.ID) },
 	func() string { return strconv.Itoa(userKey.ID) },
-	func() string { return strconv.Itoa(int(repoID)) },
-	func() string { return strconv.Itoa(int(inventoryID)) },
-	func() string { return strconv.Itoa(int(environmentID)) },
-	func() string { return strconv.Itoa(int(templateID)) },
+	func() string { return strconv.Itoa(repoID) },
+	func() string { return strconv.Itoa(inventoryID) },
+	func() string { return strconv.Itoa(environmentID) },
+	func() string { return strconv.Itoa(templateID) },
 	func() string { return strconv.Itoa(task.ID) },
 	func() string { return strconv.Itoa(schedule.ID) },
 	func() string { return strconv.Itoa(view.ID) },
+	func() string { return strconv.Itoa(integration.ID) },
+	func() string { return strconv.Itoa(integrationextractvalue.ID) },
+	func() string { return strconv.Itoa(integrationmatch.ID) },
 }
 
 // alterRequestPath with the above slice of functions
@@ -165,12 +207,14 @@ func alterRequestPath(t *trans.Transaction) {
 	exploded := make([]string, len(pathArgs))
 	copy(exploded, pathArgs)
 	for k, v := range pathSubPatterns {
+
 		pos, exists := stringInSlice(strconv.Itoa(k+1), exploded)
 		if exists {
 			pathArgs[pos] = v()
 		}
 	}
 	t.FullPath = strings.Join(pathArgs, "/")
+
 	t.Request.URI = t.FullPath
 }
 
@@ -184,11 +228,13 @@ func alterRequestBody(t *trans.Transaction) {
 	bodyFieldProcessor("json", "{}", &request)
 	if userKey != nil {
 		bodyFieldProcessor("ssh_key_id", userKey.ID, &request)
+		bodyFieldProcessor("become_key_id", userKey.ID, &request)
 	}
 	bodyFieldProcessor("environment_id", environmentID, &request)
 	bodyFieldProcessor("inventory_id", inventoryID, &request)
 	bodyFieldProcessor("repository_id", repoID, &request)
 	bodyFieldProcessor("template_id", templateID, &request)
+	bodyFieldProcessor("build_template_id", nil, &request)
 	if task != nil {
 		bodyFieldProcessor("task_id", task.ID, &request)
 	}
@@ -198,9 +244,21 @@ func alterRequestBody(t *trans.Transaction) {
 	if view != nil {
 		bodyFieldProcessor("view_id", view.ID, &request)
 	}
+
+	if integration != nil {
+		bodyFieldProcessor("integration_id", integration.ID, &request)
+	}
+	if integrationextractvalue != nil {
+		bodyFieldProcessor("value_id", integrationextractvalue.ID, &request)
+	}
+	if integrationmatch != nil {
+		bodyFieldProcessor("matcher_id", integrationmatch.ID, &request)
+	}
+
 	// Inject object ID to body for PUT requests
 	if strings.ToLower(t.Request.Method) == "put" {
-		putRequestPathRE := regexp.MustCompile(`/api/(?:project/\d+/)?\w+/(\d+)/?$`)
+
+		putRequestPathRE := regexp.MustCompile(`\w+/(\d+)/?$`)
 		m := putRequestPathRE.FindStringSubmatch(t.FullPath)
 		if len(m) > 0 {
 			objectID, err := strconv.Atoi(m[1])