[full-ci] Events (#3146)

* initial events draft

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

* start nats server with ocis

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

* use feature reva and add config

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

* remove unneeded files

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

* edge reva and fix pipeline

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

* configure nats server via ocis

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

* update expected failures

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

* add nats to parallel deployment

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

* more expected failures

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

* use NATS instead of cp SETTINGS

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

* remove more configuration options

Signed-off-by: jkoberg <jkoberg@owncloud.com>
This commit is contained in:
kobergj
2022-02-11 17:14:48 +01:00
committed by GitHub
parent d3585908b1
commit 889a42c964
20 changed files with 361 additions and 3 deletions
+18
View File
@@ -0,0 +1,18 @@
package command
import (
"github.com/owncloud/ocis/nats/pkg/config"
"github.com/urfave/cli/v2"
)
// Health is the entrypoint for the health command.
func Health(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "health",
Usage: "Check health status",
Action: func(c *cli.Context) error {
// Not implemented
return nil
},
}
}
+64
View File
@@ -0,0 +1,64 @@
package command
import (
"context"
"os"
"github.com/owncloud/ocis/nats/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/clihelper"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/thejerf/suture/v4"
"github.com/urfave/cli/v2"
)
// GetCommands provides all commands for this service
func GetCommands(cfg *config.Config) cli.Commands {
return []*cli.Command{
// start this service
Server(cfg),
// interaction with this service
// infos about this service
Health(cfg),
Version(cfg),
}
}
// Execute is the entry point for the nats command.
func Execute(cfg *config.Config) error {
app := clihelper.DefaultApp(&cli.App{
Name: "nats",
Usage: "starts nats server",
Commands: GetCommands(cfg),
})
cli.HelpFlag = &cli.BoolFlag{
Name: "help,h",
Usage: "Show the help",
}
return app.Run(os.Args)
}
// SutureService allows for the nats command to be embedded and supervised by a suture supervisor tree.
type SutureService struct {
cfg *config.Config
}
// NewSutureService creates a new nats.SutureService
func NewSutureService(cfg *ociscfg.Config) suture.Service {
cfg.Settings.Commons = cfg.Commons
return SutureService{
cfg: cfg.Nats,
}
}
func (s SutureService) Serve(ctx context.Context) error {
s.cfg.Context = ctx
if err := Execute(s.cfg); err != nil {
return err
}
return nil
}
+79
View File
@@ -0,0 +1,79 @@
package command
import (
"fmt"
"github.com/cs3org/reva/pkg/events/server"
"github.com/owncloud/ocis/nats/pkg/config"
"github.com/owncloud/ocis/nats/pkg/config/parser"
"github.com/owncloud/ocis/nats/pkg/logging"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/urfave/cli/v2"
// TODO: .Logger Option on events/server would make this import redundant
stanServer "github.com/nats-io/nats-streaming-server/server"
)
// Server is the entrypoint for the server command.
func Server(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "server",
Usage: fmt.Sprintf("start %s extension without runtime (unsupervised mode)", cfg.Service.Name),
Category: "server",
Before: func(c *cli.Context) error {
return parser.ParseConfig(cfg)
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)
err := server.RunNatsServer(server.Host(cfg.Nats.Host), server.Port(cfg.Nats.Port), server.StanOpts(func(o *stanServer.Options) {
o.CustomLogger = &logWrapper{logger}
}))
if err != nil {
return err
}
for {
}
},
}
}
// we need to wrap our logger so we can pass it to the nats server
type logWrapper struct {
logger log.Logger
}
// Noticef logs a notice statement
func (l *logWrapper) Noticef(format string, v ...interface{}) {
msg := fmt.Sprintf(format, v...)
l.logger.Info().Msg(msg)
}
// Warnf logs a warning statement
func (l *logWrapper) Warnf(format string, v ...interface{}) {
msg := fmt.Sprintf(format, v...)
l.logger.Warn().Msg(msg)
}
// Fatalf logs a fatal statement
func (l *logWrapper) Fatalf(format string, v ...interface{}) {
msg := fmt.Sprintf(format, v...)
l.logger.Fatal().Msg(msg)
}
// Errorf logs an error statement
func (l *logWrapper) Errorf(format string, v ...interface{}) {
msg := fmt.Sprintf(format, v...)
l.logger.Error().Msg(msg)
}
// Debugf logs a debug statement
func (l *logWrapper) Debugf(format string, v ...interface{}) {
msg := fmt.Sprintf(format, v...)
l.logger.Debug().Msg(msg)
}
// Tracef logs a trace statement
func (l *logWrapper) Tracef(format string, v ...interface{}) {
msg := fmt.Sprintf(format, v...)
l.logger.Trace().Msg(msg)
}
+19
View File
@@ -0,0 +1,19 @@
package command
import (
"github.com/owncloud/ocis/nats/pkg/config"
"github.com/urfave/cli/v2"
)
// Version prints the service versions of all running instances.
func Version(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "version",
Usage: "print the version of this binary and the running extension instances",
Category: "info",
Action: func(c *cli.Context) error {
// not implemented
return nil
},
}
}
+27
View File
@@ -0,0 +1,27 @@
package config
import (
"context"
"github.com/owncloud/ocis/ocis-pkg/shared"
)
// Config combines all available configuration parts.
type Config struct {
*shared.Commons
Service Service
Log *Log `ocisConfig:"log"`
Debug Debug `ocisConfig:"debug"`
Nats Nats `ociConfig:"nats"`
Context context.Context
}
// Nats is the nats config
type Nats struct {
Host string
Port int
}
+9
View File
@@ -0,0 +1,9 @@
package config
// Debug defines the available debug configuration.
type Debug struct {
Addr string `ocisConfig:"addr" env:"NATS_DEBUG_ADDR"`
Token string `ocisConfig:"token" env:"NATS_DEBUG_TOKEN"`
Pprof bool `ocisConfig:"pprof" env:"NATS_DEBUG_PPROF"`
Zpages bool `ocisConfig:"zpages" env:"NATS_DEBUG_ZPAGES"`
}
+16
View File
@@ -0,0 +1,16 @@
package config
// NOTE: Most of this configuration is not needed to keep it as simple as possible
// TODO: Clean up unneeded configuration
func DefaultConfig() *Config {
return &Config{
Service: Service{
Name: "nats",
},
Nats: Nats{
Host: "127.0.0.1",
Port: 4222,
},
}
}
+9
View File
@@ -0,0 +1,9 @@
package config
// Log defines the available log configuration.
type Log struct {
Level string `mapstructure:"level" env:"OCIS_LOG_LEVEL;NATS_LOG_LEVEL"`
Pretty bool `mapstructure:"pretty" env:"OCIS_LOG_PRETTY;NATS_LOG_PRETTY"`
Color bool `mapstructure:"color" env:"OCIS_LOG_COLOR;NATS_LOG_COLOR"`
File string `mapstructure:"file" env:"OCIS_LOG_FILE;NATS_LOG_FILE"`
}
+40
View File
@@ -0,0 +1,40 @@
package parser
import (
"errors"
"github.com/owncloud/ocis/nats/pkg/config"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/ocis-pkg/config/envdecode"
)
// ParseConfig loads accounts configuration from known paths.
func ParseConfig(cfg *config.Config) error {
_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
// provide with defaults for shared logging, since we need a valid destination address for BindEnv.
if cfg.Log == nil && cfg.Commons != nil && cfg.Commons.Log != nil {
cfg.Log = &config.Log{
Level: cfg.Commons.Log.Level,
Pretty: cfg.Commons.Log.Pretty,
Color: cfg.Commons.Log.Color,
File: cfg.Commons.Log.File,
}
} else if cfg.Log == nil {
cfg.Log = &config.Log{}
}
// load all env variables relevant to the config in the current context.
if err := envdecode.Decode(cfg); err != nil {
// no environment variable set for this config is an expected "error"
if !errors.Is(err, envdecode.ErrNoTargetFieldsAreSet) {
return err
}
}
return nil
}
+6
View File
@@ -0,0 +1,6 @@
package config
// Service defines the available service configuration.
type Service struct {
Name string
}
+17
View File
@@ -0,0 +1,17 @@
package logging
import (
"github.com/owncloud/ocis/nats/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
)
// LoggerFromConfig initializes a service-specific logger instance.
func Configure(name string, cfg *config.Log) log.Logger {
return log.NewLogger(
log.Name(name),
log.Level(cfg.Level),
log.Pretty(cfg.Pretty),
log.Color(cfg.Color),
log.File(cfg.File),
)
}