chore: change constant name to camelcase
This commit is contained in:
committed by
Jörn Friedrich Dreyer
parent
8b5b3fb430
commit
c0b4a5daa0
@@ -9,9 +9,9 @@ import (
|
|||||||
type NType int
|
type NType int
|
||||||
|
|
||||||
const (
|
const (
|
||||||
NTYPE_BUS NType = iota
|
NTypeBus NType = iota
|
||||||
NTYPE_KEYVALUE
|
NTypeKeyValue
|
||||||
NTYPE_REGISTRY
|
NTypeRegistry
|
||||||
)
|
)
|
||||||
|
|
||||||
func (n NType) String() string {
|
func (n NType) String() string {
|
||||||
|
|||||||
@@ -201,7 +201,7 @@ func (n *storeregistry) storeOptions(opts registry.Options) []store.Option {
|
|||||||
storeoptions = append(storeoptions, store.Nodes(addr...))
|
storeoptions = append(storeoptions, store.Nodes(addr...))
|
||||||
|
|
||||||
natsOptions := nats.GetDefaultOptions()
|
natsOptions := nats.GetDefaultOptions()
|
||||||
natsOptions.Name = generators.GenerateConnectionName(serviceName, generators.NTYPE_REGISTRY)
|
natsOptions.Name = generators.GenerateConnectionName(serviceName, generators.NTypeRegistry)
|
||||||
natsOptions.User, natsOptions.Password = getAuth()
|
natsOptions.User, natsOptions.Password = getAuth()
|
||||||
natsOptions.ReconnectedCB = func(_ *nats.Conn) {
|
natsOptions.ReconnectedCB = func(_ *nats.Conn) {
|
||||||
if err := n.Init(); err != nil {
|
if err := n.Init(); err != nil {
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ func Server(cfg *config.Config) *cli.Command {
|
|||||||
|
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
connName := generators.GenerateConnectionName(cfg.Service.Name, generators.NTYPE_BUS)
|
connName := generators.GenerateConnectionName(cfg.Service.Name, generators.NTypeBus)
|
||||||
evStream, err := stream.NatsFromConfig(connName, false, stream.NatsConfig(cfg.Events))
|
evStream, err := stream.NatsFromConfig(connName, false, stream.NatsConfig(cfg.Events))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Error().Err(err).Msg("Failed to initialize event stream")
|
logger.Error().Err(err).Msg("Failed to initialize event stream")
|
||||||
|
|||||||
@@ -115,7 +115,7 @@ func (av Antivirus) Run() error {
|
|||||||
av.config.Events.TLSInsecure = false
|
av.config.Events.TLSInsecure = false
|
||||||
}
|
}
|
||||||
|
|
||||||
connName := generators.GenerateConnectionName(av.config.Service.Name, generators.NTYPE_BUS)
|
connName := generators.GenerateConnectionName(av.config.Service.Name, generators.NTypeBus)
|
||||||
natsStream, err := stream.NatsFromConfig(connName, false, stream.NatsConfig(av.config.Events))
|
natsStream, err := stream.NatsFromConfig(connName, false, stream.NatsConfig(av.config.Events))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ func Server(cfg *config.Config) *cli.Command {
|
|||||||
)
|
)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
connName := generators.GenerateConnectionName(cfg.Service.Name, generators.NTYPE_BUS)
|
connName := generators.GenerateConnectionName(cfg.Service.Name, generators.NTypeBus)
|
||||||
client, err := stream.NatsFromConfig(connName, false, stream.NatsConfig(cfg.Events))
|
client, err := stream.NatsFromConfig(connName, false, stream.NatsConfig(cfg.Events))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|||||||
@@ -69,7 +69,7 @@ func Server(cfg *config.Config) *cli.Command {
|
|||||||
|
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
connName := generators.GenerateConnectionName(cfg.Service.Name, generators.NTYPE_BUS)
|
connName := generators.GenerateConnectionName(cfg.Service.Name, generators.NTypeBus)
|
||||||
s, err := stream.NatsFromConfig(connName, false, stream.NatsConfig(cfg.Events))
|
s, err := stream.NatsFromConfig(connName, false, stream.NatsConfig(cfg.Events))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ func Server(cfg *config.Config) *cli.Command {
|
|||||||
|
|
||||||
m.BuildInfo.WithLabelValues(version.GetString()).Set(1)
|
m.BuildInfo.WithLabelValues(version.GetString()).Set(1)
|
||||||
|
|
||||||
connName := generators.GenerateConnectionName(cfg.Service.Name, generators.NTYPE_BUS)
|
connName := generators.GenerateConnectionName(cfg.Service.Name, generators.NTypeBus)
|
||||||
consumer, err := stream.NatsFromConfig(connName, false, stream.NatsConfig(cfg.Events))
|
consumer, err := stream.NatsFromConfig(connName, false, stream.NatsConfig(cfg.Events))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ var _registeredEvents = []events.Unmarshaller{
|
|||||||
|
|
||||||
// ListenForEvents listens for events and acts accordingly
|
// ListenForEvents listens for events and acts accordingly
|
||||||
func ListenForEvents(ctx context.Context, cfg *config.Config, l log.Logger) error {
|
func ListenForEvents(ctx context.Context, cfg *config.Config, l log.Logger) error {
|
||||||
connName := generators.GenerateConnectionName(cfg.Service.Name, generators.NTYPE_BUS)
|
connName := generators.GenerateConnectionName(cfg.Service.Name, generators.NTypeBus)
|
||||||
bus, err := stream.NatsFromConfig(connName, false, stream.NatsConfig(cfg.Events))
|
bus, err := stream.NatsFromConfig(connName, false, stream.NatsConfig(cfg.Events))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
l.Error().Err(err).Msg("cannot connect to nats")
|
l.Error().Err(err).Msg("cannot connect to nats")
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ func Server(opts ...Option) (http.Service, error) {
|
|||||||
|
|
||||||
if options.Config.Events.Endpoint != "" {
|
if options.Config.Events.Endpoint != "" {
|
||||||
var err error
|
var err error
|
||||||
connName := generators.GenerateConnectionName(options.Config.Service.Name, generators.NTYPE_BUS)
|
connName := generators.GenerateConnectionName(options.Config.Service.Name, generators.NTypeBus)
|
||||||
eventsStream, err = stream.NatsFromConfig(connName, false, stream.NatsConfig(options.Config.Events))
|
eventsStream, err = stream.NatsFromConfig(connName, false, stream.NatsConfig(options.Config.Events))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
options.Logger.Error().
|
options.Logger.Error().
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ func SendEmail(cfg *config.Config) *cli.Command {
|
|||||||
if !daily && !weekly {
|
if !daily && !weekly {
|
||||||
return errors.New("at least one of '--daily' or '--weekly' must be set")
|
return errors.New("at least one of '--daily' or '--weekly' must be set")
|
||||||
}
|
}
|
||||||
connName := generators.GenerateConnectionName(cfg.Service.Name, generators.NTYPE_BUS)
|
connName := generators.GenerateConnectionName(cfg.Service.Name, generators.NTypeBus)
|
||||||
s, err := stream.NatsFromConfig(connName, false, stream.NatsConfig(cfg.Notifications.Events))
|
s, err := stream.NatsFromConfig(connName, false, stream.NatsConfig(cfg.Notifications.Events))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ func Server(cfg *config.Config) *cli.Command {
|
|||||||
registeredEvents[typ.String()] = e
|
registeredEvents[typ.String()] = e
|
||||||
}
|
}
|
||||||
|
|
||||||
connName := generators.GenerateConnectionName(cfg.Service.Name, generators.NTYPE_BUS)
|
connName := generators.GenerateConnectionName(cfg.Service.Name, generators.NTypeBus)
|
||||||
client, err := stream.NatsFromConfig(connName, false, stream.NatsConfig(cfg.Notifications.Events))
|
client, err := stream.NatsFromConfig(connName, false, stream.NatsConfig(cfg.Notifications.Events))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|||||||
@@ -105,7 +105,7 @@ func Server(cfg *config.Config) *cli.Command {
|
|||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
connName := generators.GenerateConnectionName(cfg.Service.Name, generators.NTYPE_BUS)
|
connName := generators.GenerateConnectionName(cfg.Service.Name, generators.NTypeBus)
|
||||||
bus, err := stream.NatsFromConfig(connName, false, stream.NatsConfig(cfg.Events))
|
bus, err := stream.NatsFromConfig(connName, false, stream.NatsConfig(cfg.Events))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ func RestartPostprocessing(cfg *config.Config) *cli.Command {
|
|||||||
return configlog.ReturnFatal(parser.ParseConfig(cfg))
|
return configlog.ReturnFatal(parser.ParseConfig(cfg))
|
||||||
},
|
},
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
connName := generators.GenerateConnectionName(cfg.Service.Name, generators.NTYPE_BUS)
|
connName := generators.GenerateConnectionName(cfg.Service.Name, generators.NTypeBus)
|
||||||
stream, err := stream.NatsFromConfig(connName, false, stream.NatsConfig{
|
stream, err := stream.NatsFromConfig(connName, false, stream.NatsConfig{
|
||||||
Endpoint: cfg.Postprocessing.Events.Endpoint,
|
Endpoint: cfg.Postprocessing.Events.Endpoint,
|
||||||
Cluster: cfg.Postprocessing.Events.Cluster,
|
Cluster: cfg.Postprocessing.Events.Cluster,
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ var (
|
|||||||
|
|
||||||
// NewPostprocessingService returns a new instance of a postprocessing service
|
// NewPostprocessingService returns a new instance of a postprocessing service
|
||||||
func NewPostprocessingService(ctx context.Context, logger log.Logger, sto store.Store, tp trace.TracerProvider, cfg *config.Config) (*PostprocessingService, error) {
|
func NewPostprocessingService(ctx context.Context, logger log.Logger, sto store.Store, tp trace.TracerProvider, cfg *config.Config) (*PostprocessingService, error) {
|
||||||
connName := generators.GenerateConnectionName(cfg.Service.Name, generators.NTYPE_BUS)
|
connName := generators.GenerateConnectionName(cfg.Service.Name, generators.NTypeBus)
|
||||||
pub, err := stream.NatsFromConfig(connName, false, stream.NatsConfig{
|
pub, err := stream.NatsFromConfig(connName, false, stream.NatsConfig{
|
||||||
Endpoint: cfg.Postprocessing.Events.Endpoint,
|
Endpoint: cfg.Postprocessing.Events.Endpoint,
|
||||||
Cluster: cfg.Postprocessing.Events.Cluster,
|
Cluster: cfg.Postprocessing.Events.Cluster,
|
||||||
|
|||||||
@@ -158,7 +158,7 @@ func Server(cfg *config.Config) *cli.Command {
|
|||||||
var publisher events.Stream
|
var publisher events.Stream
|
||||||
if cfg.Events.Endpoint != "" {
|
if cfg.Events.Endpoint != "" {
|
||||||
var err error
|
var err error
|
||||||
connName := generators.GenerateConnectionName(cfg.Service.Name, generators.NTYPE_BUS)
|
connName := generators.GenerateConnectionName(cfg.Service.Name, generators.NTypeBus)
|
||||||
publisher, err = stream.NatsFromConfig(connName, false, stream.NatsConfig(cfg.Events))
|
publisher, err = stream.NatsFromConfig(connName, false, stream.NatsConfig(cfg.Events))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Error().
|
logger.Error().
|
||||||
|
|||||||
@@ -116,7 +116,7 @@ func NewHandler(opts ...Option) (searchsvc.SearchProviderHandler, func(), error)
|
|||||||
|
|
||||||
// setup event handling
|
// setup event handling
|
||||||
|
|
||||||
connName := generators.GenerateConnectionName(cfg.Service.Name, generators.NTYPE_BUS)
|
connName := generators.GenerateConnectionName(cfg.Service.Name, generators.NTypeBus)
|
||||||
stream, err := raw.FromConfig(context.Background(), connName, raw.Config{
|
stream, err := raw.FromConfig(context.Background(), connName, raw.Config{
|
||||||
Endpoint: cfg.Events.Endpoint,
|
Endpoint: cfg.Events.Endpoint,
|
||||||
Cluster: cfg.Events.Cluster,
|
Cluster: cfg.Events.Cluster,
|
||||||
|
|||||||
@@ -136,7 +136,7 @@ func SharingConfigFromStruct(cfg *config.Config, logger log.Logger) (map[string]
|
|||||||
"tls-insecure": cfg.Events.TLSInsecure,
|
"tls-insecure": cfg.Events.TLSInsecure,
|
||||||
"tls-root-ca-cert": cfg.Events.TLSRootCaCertPath,
|
"tls-root-ca-cert": cfg.Events.TLSRootCaCertPath,
|
||||||
"enable-tls": cfg.Events.EnableTLS,
|
"enable-tls": cfg.Events.EnableTLS,
|
||||||
"name": generators.GenerateConnectionName(cfg.Service.Name, generators.NTYPE_BUS),
|
"name": generators.GenerateConnectionName(cfg.Service.Name, generators.NTypeBus),
|
||||||
"username": cfg.Events.AuthUsername,
|
"username": cfg.Events.AuthUsername,
|
||||||
"password": cfg.Events.AuthPassword,
|
"password": cfg.Events.AuthPassword,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ func Server(cfg *config.Config) *cli.Command {
|
|||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
connName := generators.GenerateConnectionName(cfg.Service.Name, generators.NTYPE_BUS)
|
connName := generators.GenerateConnectionName(cfg.Service.Name, generators.NTypeBus)
|
||||||
natsStream, err := stream.NatsFromConfig(connName, true, stream.NatsConfig(cfg.Events))
|
natsStream, err := stream.NatsFromConfig(connName, true, stream.NatsConfig(cfg.Events))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import (
|
|||||||
|
|
||||||
// NewStream prepares the requested nats stream and returns it.
|
// NewStream prepares the requested nats stream and returns it.
|
||||||
func NewStream(cfg *config.Config) (events.Stream, error) {
|
func NewStream(cfg *config.Config) (events.Stream, error) {
|
||||||
connName := generators.GenerateConnectionName(cfg.Service.Name, generators.NTYPE_BUS)
|
connName := generators.GenerateConnectionName(cfg.Service.Name, generators.NTypeBus)
|
||||||
return stream.NatsFromConfig(connName, false, stream.NatsConfig{
|
return stream.NatsFromConfig(connName, false, stream.NatsConfig{
|
||||||
Endpoint: cfg.Events.Addr,
|
Endpoint: cfg.Events.Addr,
|
||||||
Cluster: cfg.Events.ClusterID,
|
Cluster: cfg.Events.ClusterID,
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ func StorageUsersConfigFromStruct(cfg *config.Config) map[string]interface{} {
|
|||||||
"tls-insecure": cfg.Events.TLSInsecure,
|
"tls-insecure": cfg.Events.TLSInsecure,
|
||||||
"tls-root-ca-cert": cfg.Events.TLSRootCaCertPath,
|
"tls-root-ca-cert": cfg.Events.TLSRootCaCertPath,
|
||||||
"enable-tls": cfg.Events.EnableTLS,
|
"enable-tls": cfg.Events.EnableTLS,
|
||||||
"name": generators.GenerateConnectionName(cfg.Service.Name, generators.NTYPE_BUS),
|
"name": generators.GenerateConnectionName(cfg.Service.Name, generators.NTypeBus),
|
||||||
"username": cfg.Events.AuthUsername,
|
"username": cfg.Events.AuthUsername,
|
||||||
"password": cfg.Events.AuthPassword,
|
"password": cfg.Events.AuthPassword,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -77,7 +77,7 @@ func Server(cfg *config.Config) *cli.Command {
|
|||||||
|
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
connName := generators.GenerateConnectionName(cfg.Service.Name, generators.NTYPE_BUS)
|
connName := generators.GenerateConnectionName(cfg.Service.Name, generators.NTypeBus)
|
||||||
stream, err := stream.NatsFromConfig(connName, false, stream.NatsConfig(cfg.Events))
|
stream, err := stream.NatsFromConfig(connName, false, stream.NatsConfig(cfg.Events))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|||||||
Reference in New Issue
Block a user