mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-08-01 10:20:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor: back the announcement store with plain NATS JetStream

Browse Source 
Replace the go-micro store with a NATS JetStream key-value bucket, created via
reva's cache.NewNatsKeyValue, so the web service no longer depends on go-micro
stores. The store methods now take a context, threaded through the config.json
render path and the management handlers. Tests use a mockery mock of
jetstream.KeyValue.
This commit is contained in:
Dominik Schmidt
2026-07-29 10:22:43 +02:00
parent 7d59a83c18
commit 27bdda265f
11 changed files with 1856 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
services/web/pkg/server/http/server.go
View File

@@ -6,9 +6,8 @@ import (
chimiddleware "github.com/go-chi/chi/v5/middleware"
"github.com/opencloud-eu/reva/v2/pkg/rgrpc/todo/pool"
"github.com/opencloud-eu/reva/v2/pkg/store"
"github.com/opencloud-eu/reva/v2/pkg/storage/cache"
"go-micro.dev/v4"
microstore "go-micro.dev/v4/store"
"github.com/opencloud-eu/opencloud/pkg/cors"
"github.com/opencloud-eu/opencloud/pkg/middleware"
@@ -79,18 +78,20 @@ func Server(opts ...Option) (http.Service, error) {
fsx.NewBasePathFs(fsx.FromIOFS(web.Assets), "assets/themes"),
)
// persistent store for runtime managed web settings, e.g. the announcement banner
announcementStore := announcement.NewStore(store.Create(
store.Store(options.Config.Store.Store),
store.TTL(options.Config.Store.TTL),
microstore.Nodes(options.Config.Store.Nodes...),
microstore.Database(options.Config.Store.Database),
microstore.Table(options.Config.Store.Table),
store.Authentication(options.Config.Store.AuthUsername, options.Config.Store.AuthPassword),
store.TLSEnabled(options.Config.Store.EnableTLS),
store.TLSInsecure(options.Config.Store.TLSInsecure),
store.TLSRootCA(options.Config.Store.TLSRootCACertificate),
))
// NATS JetStream key-value store for runtime managed web settings, e.g. the announcement banner
kv, err := cache.NewNatsKeyValue(cache.Config{
Nodes: options.Config.Store.Nodes,
Database: options.Config.Store.Database,
AuthUsername: options.Config.Store.AuthUsername,
AuthPassword: options.Config.Store.AuthPassword,
TLSEnabled: options.Config.Store.EnableTLS,
TLSInsecure: options.Config.Store.TLSInsecure,
TLSRootCACertificate: options.Config.Store.TLSRootCACertificate,
}, &options.Logger.Logger)
if err != nil {
return http.Service{}, fmt.Errorf("could not initialize announcement store: %w", err)
}
announcementStore := announcement.NewStore(kv)
handle, err := svc.NewService(
svc.Logger(options.Logger),