fix: create bolt.db in Caddy's data dir by default (#1139)

* fix: create bolt.db in Caddy's data dir by default

* review

* Update caddy/caddy_test.go

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Signed-off-by: Kévin Dunglas <kevin@dunglas.fr>

* fix tests

* Update bolt.go

Co-authored-by: Stanislau Kviatkouski <7-zete-7@users.noreply.github.com>
Signed-off-by: Kévin Dunglas <kevin@dunglas.fr>

---------

Signed-off-by: Kévin Dunglas <kevin@dunglas.fr>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Stanislau Kviatkouski <7-zete-7@users.noreply.github.com>

Author: 3 people

caddy/bolt.go

@@ -3,6 +3,7 @@ package caddy
 import (
 	"bytes"
 	"encoding/gob"
+	"path/filepath"
 	"strconv"
 
 	"github.com/caddyserver/caddy/v2"
@@ -40,10 +41,15 @@ func (b *Bolt) GetTransport() mercure.Transport { //nolint:ireturn
 //
 //nolint:wrapcheck
 func (b *Bolt) Provision(ctx caddy.Context) error {
+	if b.Path == "" {
+		b.Path = filepath.Join(caddy.AppDataDir(), "mercure.db")
+	}
+
 	var key bytes.Buffer
 	if err := gob.NewEncoder(&key).Encode(b); err != nil {
 		return err
 	}
+
 	b.transportKey = key.String()
 
 	destructor, _, err := TransportUsagePool.LoadOrNew(b.transportKey, func() (caddy.Destructor, error) {
@@ -105,7 +111,7 @@ func (b *Bolt) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
 
 				f, e := strconv.ParseFloat(d.Val(), 64)
 				if e != nil {
-					return e
+					return d.WrapErr(e)
 				}
 
 				b.CleanupFrequency = f
@@ -117,7 +123,7 @@ func (b *Bolt) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
 
 				s, e := strconv.ParseUint(d.Val(), 10, 64)
 				if e != nil {
-					return e
+					return d.WrapErr(e)
 				}
 
 				b.Size = s

caddy/caddy_test.go

@@ -6,6 +6,7 @@ import (
 	"net/http"
 	"net/url"
 	"os"
+	"path/filepath"
 	"strings"
 	"sync"
 	"testing"
@@ -23,19 +24,23 @@ const (
 )
 
 func TestMercure(t *testing.T) {
+	boltPath := filepath.Join(t.TempDir(), "bolt.db")
+
 	data := []struct {
 		name            string
 		transportConfig string
 	}{
-		{"bolt", ""},
+		{"bolt", `transport bolt {
+			path ` + boltPath + `
+		}`},
 		{"local", "transport local\n"},
 	}
 
 	for _, d := range data {
 		t.Run(d.name, func(t *testing.T) {
 			if d.name == "bolt" {
 				t.Cleanup(func() {
-					require.NoError(t, os.Remove("bolt.db"))
+					require.NoError(t, os.Remove(boltPath))
 				})
 			}
 
@@ -115,17 +120,13 @@ example.com:9080 {
 			received.Wait()
 
 			if d.name != "bolt" {
-				assert.NoFileExists(t, "bolt.db")
+				assert.NoFileExists(t, boltPath)
 			}
 		})
 	}
 }
 
 func TestJWTPlaceholders(t *testing.T) {
-	t.Cleanup(func() {
-		require.NoError(t, os.Remove("bolt.db"))
-	})
-
 	k, _ := os.ReadFile("../fixtures/jwt/RS256.key.pub")
 	t.Setenv("TEST_JWT_KEY", string(k))
 	t.Setenv("TEST_JWT_ALG", "RS256")
@@ -144,6 +145,7 @@ func TestJWTPlaceholders(t *testing.T) {
 			mercure {
 				anonymous
 				publisher_jwt {env.TEST_JWT_KEY} {env.TEST_JWT_ALG}
+				transport local
 			}
 	
 			respond 404