unify eventstream creation

Signed-off-by: jkoberg <jkoberg@owncloud.com>

services/storage-users/pkg/command/server.go

@@ -89,7 +89,7 @@ func Server(cfg *config.Config) *cli.Command {
 			}
 
 			{
-				stream, err := event.NewStream(cfg.Events)
+				stream, err := event.NewStream(cfg)
 				if err != nil {
 					logger.Fatal().Err(err).Msg("can't connect to nats")
 				}

services/storage-users/pkg/command/trash_bin.go

@@ -32,7 +32,7 @@ func PurgeExpiredResources(cfg *config.Config) *cli.Command {
 			return configlog.ReturnFatal(parser.ParseConfig(cfg))
 		},
 		Action: func(c *cli.Context) error {
-			stream, err := event.NewStream(cfg.Events)
+			stream, err := event.NewStream(cfg)
 			if err != nil {
 				return err
 			}

services/storage-users/pkg/event/event.go

@@ -1,51 +1,18 @@
 package event
 
 import (
-	"crypto/tls"
-	"crypto/x509"
-	"os"
-
 	"github.com/cs3org/reva/v2/pkg/events/stream"
-	"github.com/go-micro/plugins/v4/events/natsjs"
-	ociscrypto "github.com/owncloud/ocis/v2/ocis-pkg/crypto"
 	"github.com/owncloud/ocis/v2/services/storage-users/pkg/config"
 	"go-micro.dev/v4/events"
 )
 
 // NewStream prepares the requested nats stream and returns it.
-func NewStream(cfg config.Events) (events.Stream, error) {
-	var tlsConf *tls.Config
-
-	if cfg.EnableTLS {
-		var rootCAPool *x509.CertPool
-		if cfg.TLSRootCaCertPath != "" {
-			rootCrtFile, err := os.Open(cfg.TLSRootCaCertPath)
-			if err != nil {
-				return nil, err
-			}
-
-			rootCAPool, err = ociscrypto.NewCertPoolFromPEM(rootCrtFile)
-			if err != nil {
-				return nil, err
-			}
-			cfg.TLSInsecure = false
-		}
-
-		tlsConf = &tls.Config{
-			MinVersion: tls.VersionTLS12,
-			RootCAs:    rootCAPool,
-		}
-	}
-
-	s, err := stream.Nats(
-		natsjs.TLSConfig(tlsConf),
-		natsjs.Address(cfg.Addr),
-		natsjs.ClusterID(cfg.ClusterID),
-	)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return s, nil
+func NewStream(cfg *config.Config) (events.Stream, error) {
+	return stream.NatsFromConfig(cfg.Service.Name, stream.NatsConfig{
+		Endpoint:             cfg.Events.Addr,
+		Cluster:              cfg.Events.ClusterID,
+		EnableTLS:            cfg.Events.EnableTLS,
+		TLSInsecure:          cfg.Events.TLSInsecure,
+		TLSRootCACertificate: cfg.Events.TLSRootCaCertPath,
+	})
 }

services/storage-users/pkg/revaconfig/config.go

@@ -47,6 +47,7 @@ func StorageUsersConfigFromStruct(cfg *config.Config) map[string]interface{} {
 					"tls-insecure":     cfg.Events.TLSInsecure,
 					"tls-root-ca-cert": cfg.Events.TLSRootCaCertPath,
 					"enable-tls":       cfg.Events.EnableTLS,
+					"name":             "storage-users-eventsmiddleware",
 				},
 				"prometheus": map[string]interface{}{
 					"namespace": "ocis",