From 70020678428291b948bf3073ecfafa324f0613b9 Mon Sep 17 00:00:00 2001 From: ianmuchyri Date: Mon, 27 Jan 2025 11:24:13 +0300 Subject: [PATCH] fix errors Signed-off-by: ianmuchyri --- cmd/cassandra-writer/main.go | 2 +- cmd/influxdb-writer/main.go | 2 +- cmd/mongodb-writer/main.go | 2 +- cmd/smpp-notifier/main.go | 49 +++++++++--------- cmd/smtp-notifier/main.go | 52 +++++++++---------- consumers/notifiers/smpp/notifier.go | 12 ++--- consumers/notifiers/smtp/notifier.go | 8 +-- consumers/tracing/consumers.go | 6 +-- consumers/writers/cassandra/consumer.go | 6 +-- consumers/writers/cassandra/consumer_test.go | 4 +- consumers/writers/influxdb/consumer.go | 6 +-- consumers/writers/influxdb/consumer_test.go | 4 +- consumers/writers/influxdb/fields.go | 2 +- consumers/writers/influxdb/tags.go | 4 +- consumers/writers/mongodb/consumer.go | 6 +-- consumers/writers/mongodb/consumer_test.go | 4 +- consumers/writers/postgres/consumer.go | 6 +-- consumers/writers/postgres/consumer_test.go | 4 +- consumers/writers/timescale/consumer.go | 6 +-- consumers/writers/timescale/consumer_test.go | 4 +- docker/.env | 3 +- docker/smpp-notifier/docker-compose.yml | 1 + docker/smtp-notifier/docker-compose.yml | 3 +- go.mod | 52 ++++++++++--------- go.sum | 54 ++++++++++++++++++++ readers/cassandra/messages.go | 2 +- readers/cassandra/messages_test.go | 4 +- readers/influxdb/messages.go | 4 +- readers/influxdb/messages_test.go | 4 +- readers/mongodb/messages.go | 2 +- readers/mongodb/messages_test.go | 4 +- 31 files changed, 191 insertions(+), 131 deletions(-) diff --git a/cmd/cassandra-writer/main.go b/cmd/cassandra-writer/main.go index fcec712..6d7e8a3 100644 --- a/cmd/cassandra-writer/main.go +++ b/cmd/cassandra-writer/main.go @@ -14,7 +14,6 @@ import ( chclient "github.com/absmach/callhome/pkg/client" "github.com/absmach/magistrala" - "github.com/absmach/magistrala/consumers" consumertracing "github.com/absmach/magistrala/consumers/tracing" "github.com/absmach/magistrala/consumers/writers/api" mglog "github.com/absmach/magistrala/logger" @@ -27,6 +26,7 @@ import ( "github.com/absmach/magistrala/pkg/uuid" "github.com/absmach/mg-contrib/consumers/writers/cassandra" cassandraclient "github.com/absmach/mg-contrib/pkg/clients/cassandra" + "github.com/absmach/supermq/consumers" "github.com/caarlos0/env/v10" "github.com/gocql/gocql" "golang.org/x/sync/errgroup" diff --git a/cmd/influxdb-writer/main.go b/cmd/influxdb-writer/main.go index f60f8e5..6e28dec 100644 --- a/cmd/influxdb-writer/main.go +++ b/cmd/influxdb-writer/main.go @@ -14,7 +14,6 @@ import ( chclient "github.com/absmach/callhome/pkg/client" "github.com/absmach/magistrala" - "github.com/absmach/magistrala/consumers" consumertracing "github.com/absmach/magistrala/consumers/tracing" "github.com/absmach/magistrala/consumers/writers/api" mglog "github.com/absmach/magistrala/logger" @@ -26,6 +25,7 @@ import ( "github.com/absmach/magistrala/pkg/uuid" "github.com/absmach/mg-contrib/consumers/writers/influxdb" influxdbclient "github.com/absmach/mg-contrib/pkg/clients/influxdb" + "github.com/absmach/supermq/consumers" "github.com/caarlos0/env/v10" "golang.org/x/sync/errgroup" ) diff --git a/cmd/mongodb-writer/main.go b/cmd/mongodb-writer/main.go index bf15acf..b94dce1 100644 --- a/cmd/mongodb-writer/main.go +++ b/cmd/mongodb-writer/main.go @@ -14,7 +14,6 @@ import ( chclient "github.com/absmach/callhome/pkg/client" "github.com/absmach/magistrala" - "github.com/absmach/magistrala/consumers" consumertracing "github.com/absmach/magistrala/consumers/tracing" "github.com/absmach/magistrala/consumers/writers/api" mglog "github.com/absmach/magistrala/logger" @@ -27,6 +26,7 @@ import ( "github.com/absmach/magistrala/pkg/uuid" "github.com/absmach/mg-contrib/consumers/writers/mongodb" mongoclient "github.com/absmach/mg-contrib/pkg/clients/mongo" + "github.com/absmach/supermq/consumers" "github.com/caarlos0/env/v10" "go.mongodb.org/mongo-driver/mongo" "golang.org/x/sync/errgroup" diff --git a/cmd/smpp-notifier/main.go b/cmd/smpp-notifier/main.go index c76f9e6..3388d9b 100644 --- a/cmd/smpp-notifier/main.go +++ b/cmd/smpp-notifier/main.go @@ -13,24 +13,26 @@ import ( "os" chclient "github.com/absmach/callhome/pkg/client" - "github.com/absmach/magistrala" - "github.com/absmach/magistrala/consumers" "github.com/absmach/magistrala/consumers/notifiers" "github.com/absmach/magistrala/consumers/notifiers/api" notifierpg "github.com/absmach/magistrala/consumers/notifiers/postgres" "github.com/absmach/magistrala/consumers/notifiers/tracing" - mglog "github.com/absmach/magistrala/logger" - "github.com/absmach/magistrala/pkg/auth" - jaegerclient "github.com/absmach/magistrala/pkg/jaeger" - "github.com/absmach/magistrala/pkg/messaging/brokers" - brokerstracing "github.com/absmach/magistrala/pkg/messaging/brokers/tracing" - pgclient "github.com/absmach/magistrala/pkg/postgres" "github.com/absmach/magistrala/pkg/prometheus" - "github.com/absmach/magistrala/pkg/server" - httpserver "github.com/absmach/magistrala/pkg/server/http" - "github.com/absmach/magistrala/pkg/ulid" - "github.com/absmach/magistrala/pkg/uuid" mgsmpp "github.com/absmach/mg-contrib/consumers/notifiers/smpp" + "github.com/absmach/supermq" + "github.com/absmach/supermq/consumers" + smqlog "github.com/absmach/supermq/logger" + smqauthn "github.com/absmach/supermq/pkg/authn" + authsvcAuthn "github.com/absmach/supermq/pkg/authn/authsvc" + "github.com/absmach/supermq/pkg/grpcclient" + jaegerclient "github.com/absmach/supermq/pkg/jaeger" + "github.com/absmach/supermq/pkg/messaging/brokers" + brokerstracing "github.com/absmach/supermq/pkg/messaging/brokers/tracing" + pgclient "github.com/absmach/supermq/pkg/postgres" + "github.com/absmach/supermq/pkg/server" + httpserver "github.com/absmach/supermq/pkg/server/http" + "github.com/absmach/supermq/pkg/ulid" + "github.com/absmach/supermq/pkg/uuid" "github.com/caarlos0/env/v10" "github.com/jmoiron/sqlx" "go.opentelemetry.io/otel/trace" @@ -66,13 +68,13 @@ func main() { log.Fatalf("failed to load %s configuration : %s", svcName, err) } - logger, err := mglog.New(os.Stdout, cfg.LogLevel) + logger, err := smqlog.New(os.Stdout, cfg.LogLevel) if err != nil { log.Fatalf("failed to init logger: %s", err.Error()) } var exitCode int - defer mglog.ExitWithError(&exitCode) + defer smqlog.ExitWithError(&exitCode) if cfg.InstanceID == "" { if cfg.InstanceID, err = uuid.New().ID(); err != nil { @@ -132,23 +134,22 @@ func main() { defer pubSub.Close() pubSub = brokerstracing.NewPubSub(httpServerConfig, tracer, pubSub) - authConfig := auth.Config{} - if err := env.ParseWithOptions(&authConfig, env.Options{Prefix: envPrefixAuth}); err != nil { - logger.Error(fmt.Sprintf("failed to load %s auth configuration : %s", svcName, err)) + grpcCfg := grpcclient.Config{} + if err := env.ParseWithOptions(&grpcCfg, env.Options{Prefix: envPrefixAuth}); err != nil { + logger.Error(fmt.Sprintf("failed to load auth gRPC client configuration : %s", err)) exitCode = 1 return } - - authClient, authHandler, err := auth.Setup(ctx, authConfig) + authn, authnClient, err := authsvcAuthn.NewAuthentication(ctx, grpcCfg) if err != nil { logger.Error(err.Error()) exitCode = 1 return } - defer authHandler.Close() - logger.Info("Successfully connected to auth grpc server " + authHandler.Secure()) + logger.Info("AuthN successfully connected to auth gRPC server " + authnClient.Secure()) + defer authnClient.Close() - svc := newService(db, tracer, authClient, cfg, smppConfig, logger) + svc := newService(db, tracer, authn, cfg, smppConfig, logger) if err = consumers.Start(ctx, svcName, pubSub, svc, cfg.ConfigPath, logger); err != nil { logger.Error(fmt.Sprintf("failed to create Postgres writer: %s", err)) exitCode = 1 @@ -158,7 +159,7 @@ func main() { hs := httpserver.NewServer(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(svc, logger, cfg.InstanceID), logger) if cfg.SendTelemetry { - chc := chclient.New(svcName, magistrala.Version, logger, cancel) + chc := chclient.New(svcName, supermq.Version, logger, cancel) go chc.CallHome(ctx) } @@ -175,7 +176,7 @@ func main() { } } -func newService(db *sqlx.DB, tracer trace.Tracer, authClient magistrala.AuthServiceClient, c config, sc mgsmpp.Config, logger *slog.Logger) notifiers.Service { +func newService(db *sqlx.DB, tracer trace.Tracer, authClient smqauthn.Authentication, c config, sc mgsmpp.Config, logger *slog.Logger) notifiers.Service { database := notifierpg.NewDatabase(db, tracer) repo := tracing.New(tracer, notifierpg.New(database)) idp := ulid.New() diff --git a/cmd/smtp-notifier/main.go b/cmd/smtp-notifier/main.go index fe09f9d..22b70c7 100644 --- a/cmd/smtp-notifier/main.go +++ b/cmd/smtp-notifier/main.go @@ -13,26 +13,28 @@ import ( "os" chclient "github.com/absmach/callhome/pkg/client" - "github.com/absmach/magistrala" - "github.com/absmach/magistrala/consumers" "github.com/absmach/magistrala/consumers/notifiers" "github.com/absmach/magistrala/consumers/notifiers/api" notifierpg "github.com/absmach/magistrala/consumers/notifiers/postgres" "github.com/absmach/magistrala/consumers/notifiers/tracing" - mglog "github.com/absmach/magistrala/logger" - "github.com/absmach/magistrala/pkg/auth" - jaegerclient "github.com/absmach/magistrala/pkg/jaeger" - "github.com/absmach/magistrala/pkg/messaging/brokers" - brokerstracing "github.com/absmach/magistrala/pkg/messaging/brokers/tracing" - pgclient "github.com/absmach/magistrala/pkg/postgres" "github.com/absmach/magistrala/pkg/prometheus" - "github.com/absmach/magistrala/pkg/server" - httpserver "github.com/absmach/magistrala/pkg/server/http" - "github.com/absmach/magistrala/pkg/ulid" - "github.com/absmach/magistrala/pkg/uuid" "github.com/absmach/mg-contrib/consumers/notifiers/smtp" email "github.com/absmach/mg-contrib/pkg/email" - "github.com/caarlos0/env/v10" + "github.com/absmach/supermq" + "github.com/absmach/supermq/consumers" + smqlog "github.com/absmach/supermq/logger" + smqauthn "github.com/absmach/supermq/pkg/authn" + authsvcAuthn "github.com/absmach/supermq/pkg/authn/authsvc" + "github.com/absmach/supermq/pkg/grpcclient" + jaegerclient "github.com/absmach/supermq/pkg/jaeger" + "github.com/absmach/supermq/pkg/messaging/brokers" + brokerstracing "github.com/absmach/supermq/pkg/messaging/brokers/tracing" + pgclient "github.com/absmach/supermq/pkg/postgres" + "github.com/absmach/supermq/pkg/server" + httpserver "github.com/absmach/supermq/pkg/server/http" + "github.com/absmach/supermq/pkg/ulid" + "github.com/absmach/supermq/pkg/uuid" + "github.com/caarlos0/env/v11" "github.com/jmoiron/sqlx" "go.opentelemetry.io/otel/trace" "golang.org/x/sync/errgroup" @@ -67,13 +69,13 @@ func main() { log.Fatalf("failed to load %s configuration : %s", svcName, err) } - logger, err := mglog.New(os.Stdout, cfg.LogLevel) + logger, err := smqlog.New(os.Stdout, cfg.LogLevel) if err != nil { log.Fatalf("failed to init logger: %s", err.Error()) } var exitCode int - defer mglog.ExitWithError(&exitCode) + defer smqlog.ExitWithError(&exitCode) if cfg.InstanceID == "" { if cfg.InstanceID, err = uuid.New().ID(); err != nil { @@ -133,24 +135,22 @@ func main() { defer pubSub.Close() pubSub = brokerstracing.NewPubSub(httpServerConfig, tracer, pubSub) - authConfig := auth.Config{} - if err := env.ParseWithOptions(&authConfig, env.Options{Prefix: envPrefixAuth}); err != nil { - logger.Error(fmt.Sprintf("failed to load %s auth configuration : %s", svcName, err)) + grpcCfg := grpcclient.Config{} + if err := env.ParseWithOptions(&grpcCfg, env.Options{Prefix: envPrefixAuth}); err != nil { + logger.Error(fmt.Sprintf("failed to load auth gRPC client configuration : %s", err)) exitCode = 1 return } - - authClient, authHandler, err := auth.Setup(ctx, authConfig) + authn, authnClient, err := authsvcAuthn.NewAuthentication(ctx, grpcCfg) if err != nil { logger.Error(err.Error()) exitCode = 1 return } - defer authHandler.Close() - - logger.Info("Successfully connected to auth grpc server " + authHandler.Secure()) + logger.Info("AuthN successfully connected to auth gRPC server " + authnClient.Secure()) + defer authnClient.Close() - svc, err := newService(db, tracer, authClient, cfg, ec, logger) + svc, err := newService(db, tracer, authn, cfg, ec, logger) if err != nil { logger.Error(err.Error()) exitCode = 1 @@ -166,7 +166,7 @@ func main() { hs := httpserver.NewServer(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(svc, logger, cfg.InstanceID), logger) if cfg.SendTelemetry { - chc := chclient.New(svcName, magistrala.Version, logger, cancel) + chc := chclient.New(svcName, supermq.Version, logger, cancel) go chc.CallHome(ctx) } @@ -183,7 +183,7 @@ func main() { } } -func newService(db *sqlx.DB, tracer trace.Tracer, authClient magistrala.AuthServiceClient, c config, ec email.Config, logger *slog.Logger) (notifiers.Service, error) { +func newService(db *sqlx.DB, tracer trace.Tracer, authClient smqauthn.Authentication, c config, ec email.Config, logger *slog.Logger) (notifiers.Service, error) { database := notifierpg.NewDatabase(db, tracer) repo := tracing.New(tracer, notifierpg.New(database)) idp := ulid.New() diff --git a/consumers/notifiers/smpp/notifier.go b/consumers/notifiers/smpp/notifier.go index bd2dd8f..0ee3cfb 100644 --- a/consumers/notifiers/smpp/notifier.go +++ b/consumers/notifiers/smpp/notifier.go @@ -6,16 +6,16 @@ package smpp import ( "time" - "github.com/absmach/magistrala/consumers/notifiers" - "github.com/absmach/magistrala/pkg/messaging" - "github.com/absmach/magistrala/pkg/transformers" - "github.com/absmach/magistrala/pkg/transformers/json" + "github.com/absmach/supermq/consumers" + "github.com/absmach/supermq/pkg/messaging" + "github.com/absmach/supermq/pkg/transformers" + "github.com/absmach/supermq/pkg/transformers/json" "github.com/fiorix/go-smpp/smpp" "github.com/fiorix/go-smpp/smpp/pdu/pdufield" "github.com/fiorix/go-smpp/smpp/pdu/pdutext" ) -var _ notifiers.Notifier = (*notifier)(nil) +var _ consumers.Notifier = (*notifier)(nil) type notifier struct { transmitter *smpp.Transmitter @@ -27,7 +27,7 @@ type notifier struct { } // New instantiates SMTP message notifier. -func New(cfg Config) notifiers.Notifier { +func New(cfg Config) consumers.Notifier { t := &smpp.Transmitter{ Addr: cfg.Address, User: cfg.Username, diff --git a/consumers/notifiers/smtp/notifier.go b/consumers/notifiers/smtp/notifier.go index cbc1b6f..51b9911 100644 --- a/consumers/notifiers/smtp/notifier.go +++ b/consumers/notifiers/smtp/notifier.go @@ -6,9 +6,9 @@ package smtp import ( "fmt" - "github.com/absmach/magistrala/consumers/notifiers" - "github.com/absmach/magistrala/pkg/messaging" "github.com/absmach/mg-contrib/pkg/email" + "github.com/absmach/supermq/consumers" + "github.com/absmach/supermq/pkg/messaging" ) const ( @@ -16,14 +16,14 @@ const ( contentTemplate = "A publisher with an id %s sent the message over %s with the following values \n %s" ) -var _ notifiers.Notifier = (*notifier)(nil) +var _ consumers.Notifier = (*notifier)(nil) type notifier struct { agent *email.Agent } // New instantiates SMTP message notifier. -func New(agent *email.Agent) notifiers.Notifier { +func New(agent *email.Agent) consumers.Notifier { return ¬ifier{agent: agent} } diff --git a/consumers/tracing/consumers.go b/consumers/tracing/consumers.go index c9cb362..845ab1f 100644 --- a/consumers/tracing/consumers.go +++ b/consumers/tracing/consumers.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "github.com/absmach/magistrala/consumers" "github.com/absmach/magistrala/pkg/server" - mgjson "github.com/absmach/magistrala/pkg/transformers/json" - "github.com/absmach/magistrala/pkg/transformers/senml" + "github.com/absmach/supermq/consumers" + mgjson "github.com/absmach/supermq/pkg/transformers/json" + "github.com/absmach/supermq/pkg/transformers/senml" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" ) diff --git a/consumers/writers/cassandra/consumer.go b/consumers/writers/cassandra/consumer.go index cd35e98..92d1190 100644 --- a/consumers/writers/cassandra/consumer.go +++ b/consumers/writers/cassandra/consumer.go @@ -8,10 +8,10 @@ import ( "encoding/json" "fmt" - "github.com/absmach/magistrala/consumers" "github.com/absmach/magistrala/pkg/errors" - mgjson "github.com/absmach/magistrala/pkg/transformers/json" - "github.com/absmach/magistrala/pkg/transformers/senml" + "github.com/absmach/supermq/consumers" + mgjson "github.com/absmach/supermq/pkg/transformers/json" + "github.com/absmach/supermq/pkg/transformers/senml" "github.com/gocql/gocql" ) diff --git a/consumers/writers/cassandra/consumer_test.go b/consumers/writers/cassandra/consumer_test.go index 9f09b74..4638da9 100644 --- a/consumers/writers/cassandra/consumer_test.go +++ b/consumers/writers/cassandra/consumer_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - "github.com/absmach/magistrala/pkg/transformers/json" - "github.com/absmach/magistrala/pkg/transformers/senml" "github.com/absmach/mg-contrib/consumers/writers/cassandra" casclient "github.com/absmach/mg-contrib/pkg/clients/cassandra" + "github.com/absmach/supermq/pkg/transformers/json" + "github.com/absmach/supermq/pkg/transformers/senml" "github.com/gofrs/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/consumers/writers/influxdb/consumer.go b/consumers/writers/influxdb/consumer.go index 86ffa3d..c71ae1f 100644 --- a/consumers/writers/influxdb/consumer.go +++ b/consumers/writers/influxdb/consumer.go @@ -8,10 +8,10 @@ import ( "math" "time" - "github.com/absmach/magistrala/consumers" "github.com/absmach/magistrala/pkg/errors" - "github.com/absmach/magistrala/pkg/transformers/json" - "github.com/absmach/magistrala/pkg/transformers/senml" + "github.com/absmach/supermq/consumers" + "github.com/absmach/supermq/pkg/transformers/json" + "github.com/absmach/supermq/pkg/transformers/senml" influxdb2 "github.com/influxdata/influxdb-client-go/v2" "github.com/influxdata/influxdb-client-go/v2/api" "github.com/influxdata/influxdb-client-go/v2/api/write" diff --git a/consumers/writers/influxdb/consumer_test.go b/consumers/writers/influxdb/consumer_test.go index 4bc0d3b..7c9071d 100644 --- a/consumers/writers/influxdb/consumer_test.go +++ b/consumers/writers/influxdb/consumer_test.go @@ -12,10 +12,10 @@ import ( mglog "github.com/absmach/magistrala/logger" "github.com/absmach/magistrala/pkg/errors" - "github.com/absmach/magistrala/pkg/transformers/json" - "github.com/absmach/magistrala/pkg/transformers/senml" "github.com/absmach/magistrala/pkg/uuid" writer "github.com/absmach/mg-contrib/consumers/writers/influxdb" + "github.com/absmach/supermq/pkg/transformers/json" + "github.com/absmach/supermq/pkg/transformers/senml" influxdata "github.com/influxdata/influxdb-client-go/v2" "github.com/stretchr/testify/assert" ) diff --git a/consumers/writers/influxdb/fields.go b/consumers/writers/influxdb/fields.go index 4916402..89bc863 100644 --- a/consumers/writers/influxdb/fields.go +++ b/consumers/writers/influxdb/fields.go @@ -4,7 +4,7 @@ package influxdb import ( - "github.com/absmach/magistrala/pkg/transformers/senml" + "github.com/absmach/supermq/pkg/transformers/senml" ) type fields map[string]interface{} diff --git a/consumers/writers/influxdb/tags.go b/consumers/writers/influxdb/tags.go index 793069b..0944258 100644 --- a/consumers/writers/influxdb/tags.go +++ b/consumers/writers/influxdb/tags.go @@ -4,8 +4,8 @@ package influxdb import ( - "github.com/absmach/magistrala/pkg/transformers/json" - "github.com/absmach/magistrala/pkg/transformers/senml" + "github.com/absmach/supermq/pkg/transformers/json" + "github.com/absmach/supermq/pkg/transformers/senml" ) type tags map[string]string diff --git a/consumers/writers/mongodb/consumer.go b/consumers/writers/mongodb/consumer.go index d655809..9395306 100644 --- a/consumers/writers/mongodb/consumer.go +++ b/consumers/writers/mongodb/consumer.go @@ -6,10 +6,10 @@ package mongodb import ( "context" - "github.com/absmach/magistrala/consumers" "github.com/absmach/magistrala/pkg/errors" - "github.com/absmach/magistrala/pkg/transformers/json" - "github.com/absmach/magistrala/pkg/transformers/senml" + "github.com/absmach/supermq/consumers" + "github.com/absmach/supermq/pkg/transformers/json" + "github.com/absmach/supermq/pkg/transformers/senml" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" ) diff --git a/consumers/writers/mongodb/consumer_test.go b/consumers/writers/mongodb/consumer_test.go index 4507376..cb1d321 100644 --- a/consumers/writers/mongodb/consumer_test.go +++ b/consumers/writers/mongodb/consumer_test.go @@ -11,9 +11,9 @@ import ( "time" mglog "github.com/absmach/magistrala/logger" - "github.com/absmach/magistrala/pkg/transformers/json" - "github.com/absmach/magistrala/pkg/transformers/senml" "github.com/absmach/mg-contrib/consumers/writers/mongodb" + "github.com/absmach/supermq/pkg/transformers/json" + "github.com/absmach/supermq/pkg/transformers/senml" "github.com/gofrs/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/consumers/writers/postgres/consumer.go b/consumers/writers/postgres/consumer.go index 28e73e7..860fccc 100644 --- a/consumers/writers/postgres/consumer.go +++ b/consumers/writers/postgres/consumer.go @@ -8,10 +8,10 @@ import ( "encoding/json" "fmt" - "github.com/absmach/magistrala/consumers" "github.com/absmach/magistrala/pkg/errors" - mgjson "github.com/absmach/magistrala/pkg/transformers/json" - "github.com/absmach/magistrala/pkg/transformers/senml" + "github.com/absmach/supermq/consumers" + mgjson "github.com/absmach/supermq/pkg/transformers/json" + "github.com/absmach/supermq/pkg/transformers/senml" "github.com/gofrs/uuid" "github.com/jackc/pgerrcode" "github.com/jackc/pgx/v5/pgconn" diff --git a/consumers/writers/postgres/consumer_test.go b/consumers/writers/postgres/consumer_test.go index 300f518..55ce0db 100644 --- a/consumers/writers/postgres/consumer_test.go +++ b/consumers/writers/postgres/consumer_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/absmach/magistrala/pkg/transformers/json" - "github.com/absmach/magistrala/pkg/transformers/senml" "github.com/absmach/mg-contrib/consumers/writers/postgres" + "github.com/absmach/supermq/pkg/transformers/json" + "github.com/absmach/supermq/pkg/transformers/senml" "github.com/gofrs/uuid" "github.com/stretchr/testify/assert" ) diff --git a/consumers/writers/timescale/consumer.go b/consumers/writers/timescale/consumer.go index 070fe5d..965e7a0 100644 --- a/consumers/writers/timescale/consumer.go +++ b/consumers/writers/timescale/consumer.go @@ -8,10 +8,10 @@ import ( "encoding/json" "fmt" - "github.com/absmach/magistrala/consumers" "github.com/absmach/magistrala/pkg/errors" - mgjson "github.com/absmach/magistrala/pkg/transformers/json" - "github.com/absmach/magistrala/pkg/transformers/senml" + "github.com/absmach/supermq/consumers" + mgjson "github.com/absmach/supermq/pkg/transformers/json" + "github.com/absmach/supermq/pkg/transformers/senml" "github.com/jackc/pgerrcode" "github.com/jackc/pgx/v5/pgconn" "github.com/jmoiron/sqlx" // required for DB access diff --git a/consumers/writers/timescale/consumer_test.go b/consumers/writers/timescale/consumer_test.go index 4d509dc..a554409 100644 --- a/consumers/writers/timescale/consumer_test.go +++ b/consumers/writers/timescale/consumer_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/absmach/magistrala/pkg/transformers/json" - "github.com/absmach/magistrala/pkg/transformers/senml" "github.com/absmach/mg-contrib/consumers/writers/timescale" + "github.com/absmach/supermq/pkg/transformers/json" + "github.com/absmach/supermq/pkg/transformers/senml" "github.com/gofrs/uuid" "github.com/stretchr/testify/assert" ) diff --git a/docker/.env b/docker/.env index a4d97dc..9afc1d2 100644 --- a/docker/.env +++ b/docker/.env @@ -92,7 +92,8 @@ MG_AUTH_INVITATION_DURATION="168h" MG_AUTH_ADAPTER_INSTANCE_ID= #### Auth GRPC Client Config -MG_AUTH_GRPC_URL=auth:8181 +MG_AUTH_URL=auth:9001 +MG_AUTH_GRPC_URL=auth:7001 MG_AUTH_GRPC_TIMEOUT=300s MG_AUTH_GRPC_CLIENT_CERT=${GRPC_MTLS:+./ssl/certs/auth-grpc-client.crt} MG_AUTH_GRPC_CLIENT_KEY=${GRPC_MTLS:+./ssl/certs/auth-grpc-client.key} diff --git a/docker/smpp-notifier/docker-compose.yml b/docker/smpp-notifier/docker-compose.yml index 213eb1a..d13aa5d 100644 --- a/docker/smpp-notifier/docker-compose.yml +++ b/docker/smpp-notifier/docker-compose.yml @@ -8,6 +8,7 @@ networks: magistrala-base-net: + driver: bridge volumes: magistrala-smpp-notifier-volume: diff --git a/docker/smtp-notifier/docker-compose.yml b/docker/smtp-notifier/docker-compose.yml index 8279cd5..88013f2 100644 --- a/docker/smtp-notifier/docker-compose.yml +++ b/docker/smtp-notifier/docker-compose.yml @@ -8,6 +8,7 @@ networks: magistrala-base-net: + driver: bridge volumes: magistrala-smtp-notifier-volume: @@ -72,7 +73,7 @@ services: - magistrala-base-net volumes: - ./config.toml:/config.toml - - ../../templates/${MG_SMTP_NOTIFIER_EMAIL_TEMPLATE}:/${MG_SMTP_NOTIFIER_EMAIL_TEMPLATE} + - ../templates/${MG_SMTP_NOTIFIER_EMAIL_TEMPLATE}:/${MG_SMTP_NOTIFIER_EMAIL_TEMPLATE} - type: bind source: ${MG_ADDONS_CERTS_PATH_PREFIX}${MG_AUTH_GRPC_CLIENT_CERT:-./ssl/certs/dummy/client_cert} target: /auth-grpc-client${MG_AUTH_GRPC_CLIENT_CERT:+.crt} diff --git a/go.mod b/go.mod index dca3c4b..7bd7e92 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,11 @@ module github.com/absmach/mg-contrib -go 1.22.5 -toolchain go1.23.4 +go 1.23.4 require ( github.com/0x6flab/namegenerator v1.4.0 github.com/absmach/callhome v0.14.0 - github.com/absmach/magistrala v0.15.1 + github.com/absmach/magistrala v0.15.2-0.20250121160443-6e1efa518300 github.com/absmach/senml v1.0.6 github.com/caarlos0/env/v10 v10.0.0 github.com/eclipse/paho.mqtt.golang v1.5.0 @@ -45,9 +44,11 @@ require ( github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect - github.com/absmach/certs v0.0.0-20241014135535-3f118b801054 // indirect + github.com/absmach/certs v0.0.0-20241209153600-91270de67b5a // indirect + github.com/absmach/supermq v0.16.1-0.20250121160622-104c5b3da4f7 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/beorn7/perks v1.0.1 // indirect + github.com/caarlos0/env/v11 v11.3.1 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/containerd/continuity v0.4.3 // indirect @@ -59,7 +60,7 @@ require ( github.com/docker/go-units v0.5.0 // indirect github.com/fatih/color v1.18.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect - github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/fsnotify/fsnotify v1.8.0 // indirect github.com/fxamacker/cbor/v2 v2.7.0 // indirect github.com/go-gorp/gorp/v3 v3.1.0 // indirect github.com/go-kit/log v0.2.1 // indirect @@ -71,7 +72,7 @@ require ( github.com/golang/snappy v0.0.4 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/google/uuid v1.6.0 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect @@ -79,8 +80,8 @@ require ( github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect github.com/jackc/puddle/v2 v2.2.2 // indirect - github.com/klauspost/compress v1.17.9 // indirect - github.com/magiconair/properties v1.8.7 // indirect + github.com/klauspost/compress v1.17.11 // indirect + github.com/magiconair/properties v1.8.9 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect @@ -88,19 +89,19 @@ require ( github.com/moby/term v0.5.0 // indirect github.com/montanaflynn/stats v0.7.1 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - github.com/nats-io/nats.go v1.37.0 // indirect - github.com/nats-io/nkeys v0.4.7 // indirect + github.com/nats-io/nats.go v1.38.0 // indirect + github.com/nats-io/nkeys v0.4.9 // indirect github.com/nats-io/nuid v1.0.1 // indirect github.com/oapi-codegen/runtime v1.1.1 // indirect github.com/oklog/ulid/v2 v2.1.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0 // indirect - github.com/opencontainers/runc v1.1.13 // indirect + github.com/opencontainers/runc v1.1.14 // indirect github.com/pelletier/go-toml/v2 v2.2.3 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.59.1 // indirect + github.com/prometheus/common v0.61.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect github.com/rabbitmq/amqp091-go v1.10.0 // indirect github.com/redis/go-redis/v9 v9.7.0 // indirect @@ -110,7 +111,7 @@ require ( github.com/smarty/assertions v1.16.0 // indirect github.com/sourcegraph/conc v0.3.0 // indirect github.com/spf13/afero v1.11.0 // indirect - github.com/spf13/cast v1.7.0 // indirect + github.com/spf13/cast v1.7.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/subosito/gotenv v1.6.0 // indirect @@ -124,21 +125,22 @@ require ( github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.34.0 // indirect go.opentelemetry.io/otel/metric v1.34.0 // indirect - go.opentelemetry.io/otel/sdk v1.32.0 // indirect - go.opentelemetry.io/proto/otlp v1.3.1 // indirect + go.opentelemetry.io/otel/sdk v1.34.0 // indirect + go.opentelemetry.io/proto/otlp v1.5.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.31.0 // indirect - golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect - golang.org/x/net v0.31.0 // indirect - golang.org/x/sys v0.28.0 // indirect + golang.org/x/crypto v0.32.0 // indirect + golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect + golang.org/x/net v0.34.0 // indirect + golang.org/x/sys v0.29.0 // indirect golang.org/x/text v0.21.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect - google.golang.org/grpc v1.68.0 // indirect - google.golang.org/protobuf v1.35.2 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect + google.golang.org/grpc v1.69.4 // indirect + google.golang.org/protobuf v1.36.3 // indirect gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index d4f9d9f..c9ffdbd 100644 --- a/go.sum +++ b/go.sum @@ -18,12 +18,18 @@ github.com/absmach/callhome v0.14.0 h1:zB4tIZJ1YUmZ1VGHFPfMA/Lo6/Mv19y2dvoOiXj2B github.com/absmach/callhome v0.14.0/go.mod h1:l12UJOfibK4Muvg/AbupHuquNV9qSz/ROdTEPg7f2Vk= github.com/absmach/certs v0.0.0-20241014135535-3f118b801054 h1:NsIwp+ueKxDx8XftruA4hz8WUgyWq7eBE344nJt0LJg= github.com/absmach/certs v0.0.0-20241014135535-3f118b801054/go.mod h1:bEAb/HjPztlrMmz8dLeJTke4Tzu9yW3+hY5eldEUtSY= +github.com/absmach/certs v0.0.0-20241209153600-91270de67b5a h1:gYbkOHsyOALSoR9D+A7fhgqGChMfakhMxy+6y3AGPPE= +github.com/absmach/certs v0.0.0-20241209153600-91270de67b5a/go.mod h1:g6Kqge7RVxwt+LRxqt+09cqa2SgPAwXvIPoyPsEqZlQ= github.com/absmach/magistrala v0.15.1 h1:3Bk2hlyWcV591LxPYwlvRcyCXTfuZ1g/EkNmU+o3NNQ= github.com/absmach/magistrala v0.15.1/go.mod h1:9pto6xuBt/IuCtZRdEha0iDQKNQ5tyNOjLXJgUiikYk= +github.com/absmach/magistrala v0.15.2-0.20250121160443-6e1efa518300 h1:gEusEKV0wbbelj/J20zb9Va1rLP8rLJaJU56IVTuyl4= +github.com/absmach/magistrala v0.15.2-0.20250121160443-6e1efa518300/go.mod h1:GKa5i+DrOA4ijWD130U0Pr/A37YM+uwzP1sU509nxs4= github.com/absmach/mgate v0.4.5 h1:l6RmrEsR9jxkdb9WHUSecmT0HA41TkZZQVffFfUAIfI= github.com/absmach/mgate v0.4.5/go.mod h1:IvRIHZexZPEIAPmmaJF0L5DY2ERjj+GxRGitOW4s6qo= github.com/absmach/senml v1.0.6 h1:WPeIl6vQ00k7ghWSZYT/QP0KUxq2+4zQoaC7240pLFk= github.com/absmach/senml v1.0.6/go.mod h1:QnJNPy1DJPy0+qUW21PTcH/xoh0LgfYZxTfwriMIvmQ= +github.com/absmach/supermq v0.16.1-0.20250121160622-104c5b3da4f7 h1:2eGHz+B2XSb6E8zYxhq4Nm9Wd536tJyvgTzYviuca8w= +github.com/absmach/supermq v0.16.1-0.20250121160622-104c5b3da4f7/go.mod h1:66MqBCZ8tCxTb475N38auU5hQCnDqBX7c6mXC1tWbwc= github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ= github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -41,6 +47,8 @@ github.com/caarlos0/env/v10 v10.0.0 h1:yIHUBZGsyqCnpTkbjk8asUlx6RFhhEs+h7TOBdgdz github.com/caarlos0/env/v10 v10.0.0/go.mod h1:ZfulV76NvVPw3tm591U4SwL3Xx9ldzBP9aGxzeN7G18= github.com/caarlos0/env/v11 v11.2.2 h1:95fApNrUyueipoZN/EhA8mMxiNxrBwDa+oAZrMWl3Kg= github.com/caarlos0/env/v11 v11.2.2/go.mod h1:JBfcdeQiBoI3Zh1QRAWfe+tpiNTmDtcCj/hHHHMx0vc= +github.com/caarlos0/env/v11 v11.3.1 h1:cArPWC15hWmEt+gWk7YBi7lEXTXCvpaSdCiZE2X5mCA= +github.com/caarlos0/env/v11 v11.3.1/go.mod h1:qupehSf/Y0TUTsxKywqRt/vJjN5nz6vauiYEUUr8P4U= github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= @@ -81,6 +89,8 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHk github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M= +github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= github.com/go-chi/chi v1.5.5 h1:vOB/HbEMt9QqBqErz07QehcOKHaWFtuj87tTDVz2qXE= @@ -137,6 +147,8 @@ github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aN github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 h1:ad0vkEBuk23VJzZR9nkLVG0YAoN9coASF1GusYX6AlU= github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0/go.mod h1:igFoXX2ELCW06bol23DWPB5BEWfZISOzSP5K2sbLea0= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 h1:VNqngBF40hVlDloBruUehVYC3ArSgIyScOAyMRqBxRg= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1/go.mod h1:RBRO7fro65R6tjKzYgLAFo0t1QEXY1Dp+i/bvpRiqiQ= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= @@ -169,6 +181,8 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= +github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= @@ -194,6 +208,8 @@ github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= +github.com/magiconair/properties v1.8.9 h1:nWcCbLq1N2v/cpNsy5WvQ37Fb+YElfq20WJ/a8RkpQM= +github.com/magiconair/properties v1.8.9/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= @@ -216,8 +232,12 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/nats-io/nats.go v1.37.0 h1:07rauXbVnnJvv1gfIyghFEo6lUcYRY0WXc3x7x0vUxE= github.com/nats-io/nats.go v1.37.0/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8= +github.com/nats-io/nats.go v1.38.0 h1:A7P+g7Wjp4/NWqDOOP/K6hfhr54DvdDQUznt5JFg9XA= +github.com/nats-io/nats.go v1.38.0/go.mod h1:IGUM++TwokGnXPs82/wCuiHS02/aKrdYUQkU8If6yjw= github.com/nats-io/nkeys v0.4.7 h1:RwNJbbIdYCoClSDNY7QVKZlyb/wfT6ugvFCiKy6vDvI= github.com/nats-io/nkeys v0.4.7/go.mod h1:kqXRgRDPlGy7nGaEDMuYzmiJCIAAWDK0IMBtDmGD0nc= +github.com/nats-io/nkeys v0.4.9 h1:qe9Faq2Gxwi6RZnZMXfmGMZkg3afLLOtrU+gDZJ35b0= +github.com/nats-io/nkeys v0.4.9/go.mod h1:jcMqs+FLG+W5YO36OX6wFIFcmpdAns+w1Wm6D3I/evE= github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= @@ -236,6 +256,8 @@ github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQ github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM= github.com/opencontainers/runc v1.1.13 h1:98S2srgG9vw0zWcDpFMn5TRrh8kLxa/5OFUstuUhmRs= github.com/opencontainers/runc v1.1.13/go.mod h1:R016aXacfp/gwQBYw2FDGa9m+n6atbLWrYY8hNMT/sA= +github.com/opencontainers/runc v1.1.14 h1:rgSuzbmgz5DUJjeSnw337TxDbRuqjs6iqQck/2weR6w= +github.com/opencontainers/runc v1.1.14/go.mod h1:E4C2z+7BxR7GHXp0hAY53mek+x49X1LjPNeMTfRGvOA= github.com/ory/dockertest/v3 v3.11.0 h1:OiHcxKAvSDUwsEVh2BjxQQc/5EHz9n0va9awCtNGuyA= github.com/ory/dockertest/v3 v3.11.0/go.mod h1:VIPxS1gwT9NpPOrfD3rACs8Y9Z7yhzO4SB194iUDnUI= github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= @@ -259,6 +281,10 @@ github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.59.1 h1:LXb1quJHWm1P6wq/U824uxYi4Sg0oGvNeUm1z5dJoX0= github.com/prometheus/common v0.59.1/go.mod h1:GpWM7dewqmVYcd7SmRaiWVe9SSqjf0UrwnYnpEZNuT0= +github.com/prometheus/common v0.60.1 h1:FUas6GcOw66yB/73KC+BOZoFJmbo/1pojoILArPAaSc= +github.com/prometheus/common v0.60.1/go.mod h1:h0LYf1R1deLSKtD4Vdg8gy4RuOvENW2J/h19V5NADQw= +github.com/prometheus/common v0.61.0 h1:3gv/GThfX0cV2lpO7gkTUwZru38mxevy90Bj8YFSRQQ= +github.com/prometheus/common v0.61.0/go.mod h1:zr29OCN/2BsJRaFwG8QOBr41D6kkchKbpeNH7pAjb/s= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rabbitmq/amqp091-go v1.10.0 h1:STpn5XsHlHGcecLmMFCtg7mqq0RnD+zFr4uzukfVhBw= @@ -290,6 +316,8 @@ github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= github.com/spf13/cast v1.7.0 h1:ntdiHjuueXFgm5nzDRdOS4yfT43P5Fnud6DH50rz/7w= github.com/spf13/cast v1.7.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= +github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y= +github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= @@ -334,22 +362,32 @@ go.mongodb.org/mongo-driver v1.17.2 h1:gvZyk8352qSfzyZ2UMWcpDpMSGEr1eqE4T793Sqyh go.mongodb.org/mongo-driver v1.17.2/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 h1:rgMkmiGfix9vFJDcDi1PK8WEQP4FLQwLDfhp5ZLpFeE= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0/go.mod h1:ijPqXp5P6IRRByFVVg9DY8P5HkxkHE5ARIa+86aXPf4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 h1:CV7UdSGJt/Ao6Gp4CXckLxVRRsRgDHoI8XjbL3PDl8s= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0/go.mod h1:FRmFuRJfag1IZ2dPkHnEoSFVgTVPUd2qf5Vi69hLb8I= go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY= go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 h1:IJFEoHiytixx8cMiVAO+GmHR6Frwu+u5Ur8njpFO6Ac= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0/go.mod h1:3rHrKNtLIoS0oZwkY2vxi+oJcwFRWdtUyRII+so45p8= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 h1:OeNbIYk/2C15ckl7glBlOBp5+WlYsOElzTNmiPW/x60= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0/go.mod h1:7Bept48yIeqxP2OZ9/AqIpYS94h2or0aB4FypJTc8ZM= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0 h1:cMyu9O88joYEaI47CnQkxO1XZdpoTF9fEnW2duIddhw= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0/go.mod h1:6Am3rn7P9TVVeXYG+wtcGE7IE1tsQ+bP3AuWcKt/gOI= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.34.0 h1:BEj3SPM81McUZHYjRS5pEgNgnmzGJ5tRpU5krWnV8Bs= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.34.0/go.mod h1:9cKLGBDzI/F3NoHLQGm4ZrYdIHsvGt6ej6hUowxY0J4= go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ= go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE= go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4= go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU= +go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A= +go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU= go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k= go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE= go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= +go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4= +go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= @@ -361,8 +399,12 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc= +golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk= golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY= +golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 h1:1UoZQm6f0P/ZO0w1Ri+f+ifG/gXhegadRdwBIXEFWDo= +golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= @@ -374,6 +416,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo= golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM= +golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= +golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE= golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -399,6 +443,8 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= +golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -424,12 +470,20 @@ gonum.org/v1/gonum v0.15.1 h1:FNy7N6OUZVUaWG9pTiD+jlhdQ3lMP+/LcTpJ6+a8sQ0= gonum.org/v1/gonum v0.15.1/go.mod h1:eZTZuRFrzu5pcyjN5wJhcIhnUdNijYxX1T2IcrOGY0o= google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 h1:M0KvPgPmDZHPlbRbaNU1APr28TvwvvdUPlSv7PUvy8g= google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:dguCy7UOdZhTvLzDyt15+rOrawrpM4q7DD9dQ1P11P4= +google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f h1:gap6+3Gk41EItBuyi4XX/bp4oqJ3UwuIMl25yGinuAA= +google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:Ic02D47M+zbarjYYUlK57y316f2MoN0gjAwI3f2S95o= google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE= google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50= google.golang.org/grpc v1.68.0 h1:aHQeeJbo8zAkAa3pRzrVjZlbz6uSfeOXlJNQM0RAbz0= google.golang.org/grpc v1.68.0/go.mod h1:fmSPC5AsjSBCK54MyHRx48kpOti1/jRfOlwEWywNjWA= +google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A= +google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io= google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= +google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk= gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/readers/cassandra/messages.go b/readers/cassandra/messages.go index e25ab6d..0856234 100644 --- a/readers/cassandra/messages.go +++ b/readers/cassandra/messages.go @@ -8,8 +8,8 @@ import ( "fmt" "github.com/absmach/magistrala/pkg/errors" - "github.com/absmach/magistrala/pkg/transformers/senml" "github.com/absmach/magistrala/readers" + "github.com/absmach/supermq/pkg/transformers/senml" "github.com/gocql/gocql" ) diff --git a/readers/cassandra/messages_test.go b/readers/cassandra/messages_test.go index 323bc67..68b9b65 100644 --- a/readers/cassandra/messages_test.go +++ b/readers/cassandra/messages_test.go @@ -9,13 +9,13 @@ import ( "testing" "time" - "github.com/absmach/magistrala/pkg/transformers/json" - "github.com/absmach/magistrala/pkg/transformers/senml" "github.com/absmach/magistrala/readers" cwriter "github.com/absmach/mg-contrib/consumers/writers/cassandra" casclient "github.com/absmach/mg-contrib/pkg/clients/cassandra" "github.com/absmach/mg-contrib/pkg/testsutil" creader "github.com/absmach/mg-contrib/readers/cassandra" + "github.com/absmach/supermq/pkg/transformers/json" + "github.com/absmach/supermq/pkg/transformers/senml" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/readers/influxdb/messages.go b/readers/influxdb/messages.go index 68bbe3b..6f61e8e 100644 --- a/readers/influxdb/messages.go +++ b/readers/influxdb/messages.go @@ -12,9 +12,9 @@ import ( "unicode" "github.com/absmach/magistrala/pkg/errors" - jsont "github.com/absmach/magistrala/pkg/transformers/json" - "github.com/absmach/magistrala/pkg/transformers/senml" "github.com/absmach/magistrala/readers" + jsont "github.com/absmach/supermq/pkg/transformers/json" + "github.com/absmach/supermq/pkg/transformers/senml" influxdb2 "github.com/influxdata/influxdb-client-go/v2" ) diff --git a/readers/influxdb/messages_test.go b/readers/influxdb/messages_test.go index 579c01e..c004994 100644 --- a/readers/influxdb/messages_test.go +++ b/readers/influxdb/messages_test.go @@ -9,12 +9,12 @@ import ( "testing" "time" - "github.com/absmach/magistrala/pkg/transformers/json" - "github.com/absmach/magistrala/pkg/transformers/senml" "github.com/absmach/magistrala/readers" iwriter "github.com/absmach/mg-contrib/consumers/writers/influxdb" "github.com/absmach/mg-contrib/pkg/testsutil" ireader "github.com/absmach/mg-contrib/readers/influxdb" + "github.com/absmach/supermq/pkg/transformers/json" + "github.com/absmach/supermq/pkg/transformers/senml" influxdb2 "github.com/influxdata/influxdb-client-go/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/readers/mongodb/messages.go b/readers/mongodb/messages.go index 5e27645..a110b7f 100644 --- a/readers/mongodb/messages.go +++ b/readers/mongodb/messages.go @@ -8,8 +8,8 @@ import ( "encoding/json" "github.com/absmach/magistrala/pkg/errors" - "github.com/absmach/magistrala/pkg/transformers/senml" "github.com/absmach/magistrala/readers" + "github.com/absmach/supermq/pkg/transformers/senml" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" diff --git a/readers/mongodb/messages_test.go b/readers/mongodb/messages_test.go index b86e7e0..99745b4 100644 --- a/readers/mongodb/messages_test.go +++ b/readers/mongodb/messages_test.go @@ -9,12 +9,12 @@ import ( "testing" "time" - "github.com/absmach/magistrala/pkg/transformers/json" - "github.com/absmach/magistrala/pkg/transformers/senml" "github.com/absmach/magistrala/readers" mwriter "github.com/absmach/mg-contrib/consumers/writers/mongodb" "github.com/absmach/mg-contrib/pkg/testsutil" mreader "github.com/absmach/mg-contrib/readers/mongodb" + "github.com/absmach/supermq/pkg/transformers/json" + "github.com/absmach/supermq/pkg/transformers/senml" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.mongodb.org/mongo-driver/mongo"