apps/cunicu
1
0
Fork 0
mirror of https://codeberg.org/cunicu/cunicu.git synced 2025-10-22 00:09:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

signaling: use BackendConfig passing more options to backend factory

Browse Source 
Signed-off-by: Steffen Vogel <post@steffenvogel.de>
This commit is contained in:
Steffen Vogel
2022-02-03 16:50:45 +01:00
parent f59b60b5a9
commit 897fbe5e1f
10 changed files with 52 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/daemon.go
View File

@@ -45,9 +45,11 @@ func NewDaemon(cfg *config.Config) (*Daemon, error) {
// Create backend
var backend signaling.Backend
if len(cfg.Backends) == 1 {
backend, err = signaling.NewBackend(cfg.Backends[0], events)
backend, err = signaling.NewBackend(&signaling.BackendConfig{
URI: cfg.Backends[0],
}, events)
} else {
backend, err = signaling.NewMultiBackend(cfg.Backends, events)
backend, err = signaling.NewMultiBackend(cfg.Backends, &signaling.BackendConfig{}, events)
}
if err != nil {
return nil, fmt.Errorf("failed to initialize signaling backend: %w", err)

15
pkg/signaling/backend.go
View File

@@ -16,13 +16,18 @@ var (
type BackendType string // URL schemes
type BackendFactory func(*url.URL, chan *pb.Event) (Backend, error)
type BackendFactory func(*BackendConfig, chan *pb.Event) (Backend, error)
type BackendPlugin struct {
New BackendFactory
Description string
}
type BackendConfig struct {
URI *url.URL
Community *crypto.Key
}
type Backend interface {
io.Closer
@@ -30,8 +35,8 @@ type Backend interface {
Subscribe(kp *crypto.KeyPair) (chan *pb.SignalingMessage, error)
}
func NewBackend(uri *url.URL, events chan *pb.Event) (Backend, error) {
typs := strings.SplitN(uri.Scheme, "+", 2)
func NewBackend(cfg *BackendConfig, events chan *pb.Event) (Backend, error) {
typs := strings.SplitN(cfg.URI.Scheme, "+", 2)
typ := BackendType(typs[0])
p, ok := Backends[typ]
@@ -40,10 +45,10 @@ func NewBackend(uri *url.URL, events chan *pb.Event) (Backend, error) {
}
if len(typs) > 1 {
uri.Scheme = typs[1]
cfg.URI.Scheme = typs[1]
}
be, err := p.New(uri, events)
be, err := p.New(cfg, events)
if err != nil {
return nil, err
}

6
pkg/signaling/backend_test.go
View File

@@ -17,7 +17,11 @@ func TestNewBackend(t *testing.T) {
events := make(chan *pb.Event, 100)
b, err := signaling.NewBackend(uri, events)
cfg := &signaling.BackendConfig{
URI: uri,
}
b, err := signaling.NewBackend(cfg, events)
if err != nil {
t.Fatalf("Failed to create new backend: %s", err)
}

5
pkg/signaling/grpc/backend.go
View File

@@ -3,7 +3,6 @@ package grpc
import (
"context"
"fmt"
"net/url"
"go.uber.org/zap"
"google.golang.org/grpc"
@@ -28,14 +27,14 @@ type Backend struct {
logger *zap.Logger
}
func NewBackend(uri *url.URL, events chan *pb.Event) (signaling.Backend, error) {
func NewBackend(cfg *signaling.BackendConfig, events chan *pb.Event) (signaling.Backend, error) {
var err error
b := &Backend{
logger: zap.L().Named("grpc"),
}
if err := b.config.Parse(uri); err != nil {
if err := b.config.Parse(cfg); err != nil {
return nil, fmt.Errorf("failed to parse backend configuration: %w", err)
}

15
pkg/signaling/grpc/config.go
View File

@@ -2,24 +2,25 @@ package grpc
import (
"errors"
"net/url"
"strconv"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
"riasc.eu/wice/pkg/signaling"
)
type BackendConfig struct {
URI *url.URL
signaling.BackendConfig
Target string
Options []grpc.DialOption
}
func (c *BackendConfig) Parse(uri *url.URL) error {
options := uri.Query()
func (c *BackendConfig) Parse(cfg *signaling.BackendConfig) error {
c.BackendConfig = *cfg
options := c.URI.Query()
if str := options.Get("insecure"); str != "" {
if b, err := strconv.ParseBool(str); err == nil && b {
c.Options = append(c.Options, grpc.WithTransportCredentials(
@@ -28,13 +29,11 @@ func (c *BackendConfig) Parse(uri *url.URL) error {
}
}
c.URI = uri
if uri.Host == "" {
if c.URI.Host == "" {
return errors.New("missing gRPC server url")
}
c.Target = uri.Host
c.Target = c.URI.Host
return nil
}

15
pkg/signaling/k8s/backend.go
View File

@@ -2,9 +2,7 @@ package k8s
import (
"context"
"encoding/json"
"fmt"
"net/url"
"go.uber.org/zap"
corev1 "k8s.io/api/core/v1"
@@ -50,7 +48,7 @@ func init() {
}
}
func NewBackend(uri *url.URL, events chan *pb.Event) (signaling.Backend, error) {
func NewBackend(cfg *signaling.BackendConfig, events chan *pb.Event) (signaling.Backend, error) {
var config *rest.Config
var err error
@@ -63,12 +61,11 @@ func NewBackend(uri *url.URL, events chan *pb.Event) (signaling.Backend, error)
events: events,
}
if err := b.config.Parse(uri); err != nil {
if err := b.config.Parse(cfg); err != nil {
return nil, fmt.Errorf("failed to parse configuration: %w", err)
}
kubeconfig := uri.Path
if kubeconfig == "" {
if b.config.Kubeconfig == "" {
loadingRules := clientcmd.NewDefaultClientConfigLoadingRules()
// if you want to change the loading rules (which files in which order), you can do so here
@@ -80,14 +77,12 @@ func NewBackend(uri *url.URL, events chan *pb.Event) (signaling.Backend, error)
if config, err = kubeConfig.ClientConfig(); err != nil {
return nil, fmt.Errorf("failed to load config: %w", err)
}
} else if kubeconfig == "incluster" {
} else if b.config.Kubeconfig == "incluster" {
if config, err = rest.InClusterConfig(); err != nil {
return nil, fmt.Errorf("failed to get incluster configuration: %w", err)
}
} else {
config, err = clientcmd.BuildConfigFromFlags("", kubeconfig)
if err != nil {
if config, err = clientcmd.BuildConfigFromFlags("", b.config.Kubeconfig); err != nil {
return nil, fmt.Errorf("failed to get configuration from flags: %w", err)
}
}

10
pkg/signaling/k8s/config.go
View File

@@ -6,8 +6,9 @@ import (
)
type BackendConfig struct {
URI *url.URL
signaling.BackendConfig
Kubeconfig string
NodeName string
AnnotationOffers string
AnnotationPublicKey string
@@ -18,7 +19,9 @@ var defaultConfig = BackendConfig{
AnnotationPublicKey: defaultAnnotationPublicKey,
}
func (c *BackendConfig) Parse(uri *url.URL) error {
func (c *BackendConfig) Parse(cfg *signaling.BackendConfig) error {
c.BackendConfig = *cfg
options := uri.Query()
if str := options.Get("node"); str == "" {
@@ -33,8 +36,7 @@ func (c *BackendConfig) Parse(uri *url.URL) error {
c.AnnotationPublicKey = str
}
uri.RawQuery = ""
c.URI = uri
c.Kubeconfig = c.URI.Path
return nil
}

11
pkg/signaling/multi.go
View File

@@ -11,18 +11,19 @@ type MultiBackend struct {
backends []Backend
}
func NewMultiBackend(uris []*url.URL, events chan *pb.Event) (Backend, error) {
func NewMultiBackend(uris []*url.URL, cfg *BackendConfig, events chan *pb.Event) (Backend, error) {
mb := &MultiBackend{
backends: []Backend{},
}
for _, u := range uris {
b, err := NewBackend(u, events)
if err != nil {
cfg.URI = u
if b, err := NewBackend(cfg, events); err == nil {
mb.backends = append(mb.backends, b)
} else {
return nil, err
}
mb.backends = append(mb.backends, b)
}
return mb, nil

5
pkg/signaling/p2p/backend.go
View File

@@ -3,7 +3,6 @@ package p2p
import (
"context"
"fmt"
"net/url"
"sync"
p2p "github.com/libp2p/go-libp2p"
@@ -54,7 +53,7 @@ type Backend struct {
events chan *pb.Event
}
func NewBackend(uri *url.URL, events chan *pb.Event) (signaling.Backend, error) {
func NewBackend(cfg *signaling.BackendConfig, events chan *pb.Event) (signaling.Backend, error) {
var err error
b := &Backend{
@@ -64,7 +63,7 @@ func NewBackend(uri *url.URL, events chan *pb.Event) (signaling.Backend, error)
events: events,
}
if err := b.config.Parse(uri); err != nil {
if err := b.config.Parse(cfg); err != nil {
return nil, fmt.Errorf("failed to parse backend options: %w", err)
}

10
pkg/signaling/p2p/config.go
View File

@@ -2,7 +2,6 @@ package p2p
import (
"fmt"
"net/url"
"strconv"
"github.com/libp2p/go-libp2p-core/crypto"
@@ -11,6 +10,7 @@ import (
dht "github.com/libp2p/go-libp2p-kad-dht"
"github.com/libp2p/go-libp2p/p2p/host/autorelay"
maddr "github.com/multiformats/go-multiaddr"
"riasc.eu/wice/pkg/signaling"
)
const (
@@ -31,7 +31,7 @@ type peerAddressList []peer.AddrInfo
type multiAddressList []maddr.Multiaddr
type BackendConfig struct {
URI *url.URL
signaling.BackendConfig
// Load some options
ListenAddresses multiAddressList
@@ -98,12 +98,12 @@ func (al *peerAddressList) Set(as []string) error {
return nil
}
func (c *BackendConfig) Parse(uri *url.URL) error {
func (c *BackendConfig) Parse(cfg *signaling.BackendConfig) error {
var err error
c.RendezvousString = uri.Opaque
options := cfg.URI.Query()
options := uri.Query()
c.BackendConfig = *cfg
if pkStr := options.Get("private-key"); pkStr != "" {
pk, err := crypto.ConfigDecodeKey(pkStr)