feat: add end 2 end tests
This commit is contained in:
Jon Lundy
@@ -1,32 +0,0 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
|
||||
"github.com/sour-is/ev"
|
||||
"github.com/sour-is/ev/app/webfinger"
|
||||
"github.com/sour-is/ev/internal/lg"
|
||||
"github.com/sour-is/ev/pkg/service"
|
||||
"github.com/sour-is/ev/pkg/slice"
|
||||
)
|
||||
|
||||
var _ = apps.Register(50, func(ctx context.Context, svc *service.Harness) error {
|
||||
ctx, span := lg.Span(ctx)
|
||||
defer span.End()
|
||||
|
||||
span.AddEvent("Enable WebFinger")
|
||||
eventstore, ok := slice.Find[*ev.EventStore](svc.Services...)
|
||||
if !ok {
|
||||
return fmt.Errorf("*es.EventStore not found in services")
|
||||
}
|
||||
|
||||
wf, err := webfinger.New(ctx, eventstore)
|
||||
if err != nil {
|
||||
span.RecordError(err)
|
||||
return err
|
||||
}
|
||||
svc.Add(wf)
|
||||
|
||||
return nil
|
||||
})
|
||||
1
cmd/webfinger/app.webfinger.go
Symbolic link
1
cmd/webfinger/app.webfinger.go
Symbolic link
@@ -0,0 +1 @@
|
||||
../ev/app.webfinger.go
|
||||
@@ -1,37 +0,0 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"log"
|
||||
"net/http"
|
||||
"os"
|
||||
"os/signal"
|
||||
|
||||
"github.com/sour-is/ev/internal/lg"
|
||||
"github.com/sour-is/ev/pkg/service"
|
||||
)
|
||||
|
||||
var apps service.Apps
|
||||
var appName, version = service.AppName()
|
||||
|
||||
func main() {
|
||||
ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt, os.Kill)
|
||||
go func() {
|
||||
<-ctx.Done()
|
||||
defer cancel() // restore interrupt function
|
||||
}()
|
||||
|
||||
svc := &service.Harness{}
|
||||
|
||||
ctx, stop := lg.Init(ctx, appName)
|
||||
svc.OnStop(stop)
|
||||
svc.Add(lg.NewHTTP(ctx))
|
||||
|
||||
svc.Setup(ctx, apps.Apps()...)
|
||||
|
||||
// Run application
|
||||
if err := svc.Run(ctx, appName, version); err != nil && !errors.Is(err, http.ErrServerClosed) {
|
||||
log.Fatal(err)
|
||||
}
|
||||
}
|
||||
1
cmd/webfinger/main.go
Symbolic link
1
cmd/webfinger/main.go
Symbolic link
@@ -0,0 +1 @@
|
||||
../ev/main.go
|
||||
@@ -1,53 +0,0 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/sour-is/ev"
|
||||
"github.com/sour-is/ev/internal/lg"
|
||||
"github.com/sour-is/ev/pkg/env"
|
||||
"github.com/sour-is/ev/pkg/es"
|
||||
diskstore "github.com/sour-is/ev/pkg/es/driver/disk-store"
|
||||
memstore "github.com/sour-is/ev/pkg/es/driver/mem-store"
|
||||
"github.com/sour-is/ev/pkg/es/driver/projecter"
|
||||
resolvelinks "github.com/sour-is/ev/pkg/es/driver/resolve-links"
|
||||
"github.com/sour-is/ev/pkg/es/driver/streamer"
|
||||
"github.com/sour-is/ev/pkg/es/event"
|
||||
"github.com/sour-is/ev/pkg/service"
|
||||
"go.uber.org/multierr"
|
||||
)
|
||||
|
||||
var _ = apps.Register(10, func(ctx context.Context, svc *service.Harness) error {
|
||||
ctx, span := lg.Span(ctx)
|
||||
defer span.End()
|
||||
|
||||
// setup eventstore
|
||||
err := multierr.Combine(
|
||||
ev.Init(ctx),
|
||||
event.Init(ctx),
|
||||
diskstore.Init(ctx),
|
||||
memstore.Init(ctx),
|
||||
)
|
||||
if err != nil {
|
||||
span.RecordError(err)
|
||||
return err
|
||||
}
|
||||
|
||||
eventstore, err := ev.Open(
|
||||
ctx,
|
||||
env.Default("EV_DATA", "mem:"),
|
||||
resolvelinks.New(),
|
||||
streamer.New(ctx),
|
||||
projecter.New(
|
||||
ctx,
|
||||
projecter.DefaultProjection,
|
||||
),
|
||||
)
|
||||
if err != nil {
|
||||
span.RecordError(err)
|
||||
return err
|
||||
}
|
||||
svc.Add(eventstore, &es.EventStore{EventStore: eventstore})
|
||||
|
||||
return nil
|
||||
})
|
||||
1
cmd/webfinger/svc.es.go
Symbolic link
1
cmd/webfinger/svc.es.go
Symbolic link
@@ -0,0 +1 @@
|
||||
../ev/svc.es.go
|
||||
@@ -1,46 +0,0 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"log"
|
||||
"net/http"
|
||||
"strings"
|
||||
|
||||
"github.com/rs/cors"
|
||||
"github.com/sour-is/ev/internal/lg"
|
||||
"github.com/sour-is/ev/pkg/env"
|
||||
"github.com/sour-is/ev/pkg/mux"
|
||||
"github.com/sour-is/ev/pkg/service"
|
||||
"github.com/sour-is/ev/pkg/slice"
|
||||
)
|
||||
|
||||
var _ = apps.Register(20, func(ctx context.Context, svc *service.Harness) error {
|
||||
s := &http.Server{}
|
||||
svc.Add(s)
|
||||
|
||||
mux := mux.New()
|
||||
s.Handler = cors.AllowAll().Handler(mux)
|
||||
|
||||
// s.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
// log.Println(r.URL.Path)
|
||||
// mux.ServeHTTP(w, r)
|
||||
// })
|
||||
|
||||
s.Addr = env.Default("EV_HTTP", ":8080")
|
||||
if strings.HasPrefix(s.Addr, ":") {
|
||||
s.Addr = "[::]" + s.Addr
|
||||
}
|
||||
svc.OnStart(func(ctx context.Context) error {
|
||||
_, span := lg.Span(ctx)
|
||||
defer span.End()
|
||||
|
||||
log.Print("Listen on ", s.Addr)
|
||||
span.AddEvent("begin listen and serve on " + s.Addr)
|
||||
|
||||
mux.Add(slice.FilterType[interface{ RegisterHTTP(*http.ServeMux) }](svc.Services...)...)
|
||||
return s.ListenAndServe()
|
||||
})
|
||||
svc.OnStop(s.Shutdown)
|
||||
|
||||
return nil
|
||||
})
|
||||
1
cmd/webfinger/svc.http.go
Symbolic link
1
cmd/webfinger/svc.http.go
Symbolic link
@@ -0,0 +1 @@
|
||||
../ev/svc.http.go
|
||||
108
cmd/webfinger/webfinger_e2e_test.go
Normal file
108
cmd/webfinger/webfinger_e2e_test.go
Normal file
@@ -0,0 +1,108 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"crypto/ed25519"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"os"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/matryer/is"
|
||||
"github.com/sour-is/ev/app/webfinger"
|
||||
"golang.org/x/sync/errgroup"
|
||||
)
|
||||
|
||||
func TestMain(m *testing.M) {
|
||||
data, err := os.MkdirTemp("", "data*")
|
||||
if err != nil {
|
||||
fmt.Printf("error creating data dir: %s\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
defer os.RemoveAll(data)
|
||||
|
||||
os.Setenv("EV_HTTP", "[::1]:61234")
|
||||
os.Setenv("WEBFINGER_DOMAINS", "::1")
|
||||
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
defer cancel()
|
||||
|
||||
wg, ctx := errgroup.WithContext(ctx)
|
||||
wg.Go(func() error {
|
||||
// Run application
|
||||
if err := Run(ctx); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
})
|
||||
wg.Go(func() error {
|
||||
m.Run()
|
||||
cancel()
|
||||
return nil
|
||||
})
|
||||
|
||||
if err := wg.Wait(); err != nil {
|
||||
fmt.Println(err)
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
|
||||
func TestGetHTTP(t *testing.T) {
|
||||
is := is.New(t)
|
||||
res, err := http.DefaultClient.Get("http://[::1]:61234/.well-known/webfinger")
|
||||
is.NoErr(err)
|
||||
is.Equal(res.StatusCode, http.StatusBadRequest)
|
||||
}
|
||||
|
||||
func TestCreateResource(t *testing.T) {
|
||||
is := is.New(t)
|
||||
|
||||
_, priv, err := ed25519.GenerateKey(nil)
|
||||
is.NoErr(err)
|
||||
|
||||
jrd := &webfinger.JRD{
|
||||
Subject: "me@sour.is",
|
||||
Properties: map[string]*string{
|
||||
"foo": ptr("bar"),
|
||||
},
|
||||
}
|
||||
|
||||
// create
|
||||
token, err := webfinger.NewSignedRequest(jrd, priv)
|
||||
is.NoErr(err)
|
||||
|
||||
req, err := http.NewRequest(http.MethodPut, "http://[::1]:61234/.well-known/webfinger", strings.NewReader(token))
|
||||
is.NoErr(err)
|
||||
|
||||
res, err := http.DefaultClient.Do(req)
|
||||
is.NoErr(err)
|
||||
|
||||
is.Equal(res.StatusCode, http.StatusCreated)
|
||||
|
||||
// repeat
|
||||
req, err = http.NewRequest(http.MethodPut, "http://[::1]:61234/.well-known/webfinger", strings.NewReader(token))
|
||||
is.NoErr(err)
|
||||
|
||||
res, err = http.DefaultClient.Do(req)
|
||||
is.NoErr(err)
|
||||
|
||||
is.Equal(res.StatusCode, http.StatusAlreadyReported)
|
||||
|
||||
// fetch
|
||||
req, err = http.NewRequest(http.MethodGet, "http://[::1]:61234/.well-known/webfinger?resource=me@sour.is", nil)
|
||||
is.NoErr(err)
|
||||
|
||||
res, err = http.DefaultClient.Do(req)
|
||||
is.NoErr(err)
|
||||
|
||||
is.Equal(res.StatusCode, http.StatusOK)
|
||||
|
||||
resJRD := &webfinger.JRD{}
|
||||
err = json.NewDecoder(res.Body).Decode(resJRD)
|
||||
is.NoErr(err)
|
||||
is.Equal(jrd.Subject, resJRD.Subject)
|
||||
}
|
||||
|
||||
func ptr[T any](t T) *T { return &t }
|
||||
Reference in New Issue
Block a user