feat: update arcad/edge dependency

Jenkinsfile

@@ -10,6 +10,16 @@ pipeline {
     }
 
     stages {
+        stage('Cancel older jobs') {
+            steps {
+                script {
+                    def buildNumber = env.BUILD_NUMBER as int
+                    if (buildNumber > 1) milestone(buildNumber - 1)
+                    milestone(buildNumber)
+                }
+            }
+        }
+        
         stage('Run unit tests') {
             steps {
                 script {
@@ -58,7 +68,8 @@ pipeline {
                             job: "../emissary-firmware/${env.GIT_BRANCH}",
                             parameters: [
                                 [$class: 'StringParameterValue', name: 'emissaryRelease', value: currentVersion]
-                            ]
+                            ],
+                            wait: false
                         )
                     }
                 }

Makefile

@@ -154,4 +154,12 @@ load-sample-specs:
 	cat misc/spec-samples/mdns.emissary.cadoles.com.json | ./bin/server api agent spec update -a $(AGENT_ID) --no-patch --spec-data - --spec-name mdns.emissary.cadoles.com
 
 full-version:
-	@echo $(FULL_VERSION)
+	@echo $(FULL_VERSION)
+
+update-edge-lib:
+	git pull --rebase
+	GOPRIVATE=forge.cadoles.com/arcad/edge go get -u forge.cadoles.com/arcad/edge
+	go mod tidy
+	git add go.mod go.sum
+	git commit -m "feat: update arcad/edge dependency"
+	git push

go.mod

@@ -3,7 +3,7 @@ module forge.cadoles.com/Cadoles/emissary
 go 1.19
 
 require (
-	forge.cadoles.com/arcad/edge v0.0.0-20230405131922-006f13bc7b88
+	forge.cadoles.com/arcad/edge v0.0.0-20230411091100-98ebd7a1689e
 	github.com/Masterminds/sprig/v3 v3.2.3
 	github.com/alecthomas/participle/v2 v2.0.0-beta.5
 	github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883

go.sum

@@ -54,8 +54,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-forge.cadoles.com/arcad/edge v0.0.0-20230405131922-006f13bc7b88 h1:d+AXw/Kx8X7M4GvtPC/mkZWK3tRMT051XORAiQAnClA=
-forge.cadoles.com/arcad/edge v0.0.0-20230405131922-006f13bc7b88/go.mod h1:Vx4iq/oewXUOkGyi8QKc14clTLNO1sWpb0SjBYELlAs=
+forge.cadoles.com/arcad/edge v0.0.0-20230411091100-98ebd7a1689e h1:IPDTOO5u09ZjX6lmWuKNsrvgNMTaNY0/l7IwolXmUdE=
+forge.cadoles.com/arcad/edge v0.0.0-20230411091100-98ebd7a1689e/go.mod h1:Vx4iq/oewXUOkGyi8QKc14clTLNO1sWpb0SjBYELlAs=
 gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8=
 github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8/go.mod h1:CzsSbkDixRphAF5hS6wbMKq0eI6ccJRb7/A0M6JBnwg=
 github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k=

internal/agent/controller/app/app_handler.go

@@ -30,7 +30,7 @@ import (
 	"gitlab.com/wpetit/goweb/logger"
 )
 
-const defaultSQLiteParams = "?_pragma=foreign_keys(1)&_pragma=journal_mode(WAL)&_txlock=immediate"
+const defaultSQLiteParams = "?_pragma=foreign_keys(1)&_pragma=busy_timeout=60000"
 
 func (c *Controller) getHandlerOptions(ctx context.Context, appKey string, specs *spec.Spec) ([]edgeHTTP.HandlerOptionFunc, error) {
 	dataDir, err := c.ensureAppDataDir(ctx, appKey)
@@ -151,6 +151,8 @@ func createResolveAppURL(specs *spec.Spec) (ResolveAppURLFunc, error) {
 						ctx, "could not find interface",
 						logger.E(errors.WithStack(err)), logger.F("iface", ifaceName),
 					)
+
+					continue
 				}
 
 				addresses, err := iface.Addrs()
@@ -203,6 +205,7 @@ func createResolveAppURL(specs *spec.Spec) (ResolveAppURLFunc, error) {
 			}
 
 			appEntry = &entry
+			break
 		}
 
 		if appEntry == nil {

internal/agent/controller/app/app_handler_test.go

@@ -15,11 +15,18 @@ func TestCreateResolveAppURL(t *testing.T) {
 			"app.arcad.test": {
 				Address: ":8080",
 			},
+			"app.arcad.foo": {
+				Address: ":8081",
+			},
+			"app.arcad.bar": {
+				Address: ":8082",
+			},
 		},
 		Config: &spec.Config{
 			AppURLResolving: &spec.AppURLResolving{
 				IfaceMappings: map[string]string{
-					"lo": "http://{{ .DeviceIP }}:{{ .AppPort }}",
+					"lo":              "http://{{ .DeviceIP }}:{{ .AppPort }}",
+					"does-not-exists": "http://{{ .DeviceIP }}:{{ .AppPort }}",
 				},
 				DefaultURLTemplate: `http://{{ last ( splitList "." ( toString .Manifest.ID ) ) }}.arcad.local`,
 			},

internal/config/database.go

@@ -15,6 +15,6 @@ type DatabaseConfig struct {
 func NewDefaultDatabaseConfig() DatabaseConfig {
 	return DatabaseConfig{
 		Driver: "sqlite",
-		DSN:    "sqlite://emissary.sqlite?_pragma=foreign_keys(1)&_pragma=journal_mode(WAL)&_txlock=immediate",
+		DSN:    "sqlite://emissary.sqlite?_pragma=foreign_keys(1)&_pragma=busy_timeout=60000",
 	}
 }

misc/packaging/common/config-server.yml

@@ -9,7 +9,7 @@ server:
     port: 3000
   database:
     driver: sqlite
-    dsn: sqlite:///var/lib/emissary/data.sqlite?_pragma=foreign_keys(1)&_pragma=journal_mode(WAL)&_txlock=immediate
+    dsn: sqlite:///var/lib/emissary/data.sqlite?_pragma=foreign_keys(1)&_pragma=busy_timeout=60000
   cors:
     allowedOrigins: []
     allowCredentials: true