diff --git a/bootstrap/api/endpoint_test.go b/bootstrap/api/endpoint_test.go index 18970afd9f..89bbd8f992 100644 --- a/bootstrap/api/endpoint_test.go +++ b/bootstrap/api/endpoint_test.go @@ -120,7 +120,6 @@ func newConfig(channels []bootstrap.Channel) bootstrap.Config { func (tr testRequest) make() (*http.Response, error) { req, err := http.NewRequest(tr.method, tr.url, tr.body) - if err != nil { return nil, err } @@ -536,6 +535,7 @@ func TestUpdate(t *testing.T) { assert.Equal(t, tc.status, res.StatusCode, fmt.Sprintf("%s: expected status code %d got %d", tc.desc, tc.status, res.StatusCode)) } } + func TestUpdateCert(t *testing.T) { auth := mocks.NewAuthClient(map[string]string{validToken: email}) @@ -1012,7 +1012,8 @@ func TestRemove(t *testing.T) { id: saved.ThingID, auth: invalidToken, status: http.StatusUnauthorized, - }, { + }, + { desc: "remove with an empty token", id: saved.ThingID, auth: "", diff --git a/bootstrap/mocks/configs.go b/bootstrap/mocks/configs.go index cca45a8e13..abbd1cf87e 100644 --- a/bootstrap/mocks/configs.go +++ b/bootstrap/mocks/configs.go @@ -75,7 +75,6 @@ func (crm *configRepositoryMock) RetrieveByID(_ context.Context, token, id strin } return c, nil - } func (crm *configRepositoryMock) RetrieveAll(_ context.Context, token string, filter bootstrap.Filter, offset, limit uint64) bootstrap.ConfigsPage { diff --git a/bootstrap/mocks/things.go b/bootstrap/mocks/things.go index f5b3763e5d..11c3091da8 100644 --- a/bootstrap/mocks/things.go +++ b/bootstrap/mocks/things.go @@ -62,7 +62,6 @@ func (svc *mainfluxThings) ViewClient(ctx context.Context, token, id string) (mf if t, ok := svc.things[id]; ok && t.Owner == userID.GetId() { return t, nil - } return mfclients.Client{}, errors.ErrNotFound diff --git a/bootstrap/postgres/setup_test.go b/bootstrap/postgres/setup_test.go index f411179cc9..5b4461b896 100644 --- a/bootstrap/postgres/setup_test.go +++ b/bootstrap/postgres/setup_test.go @@ -9,11 +9,10 @@ import ( "testing" "github.com/jmoiron/sqlx" - bootstrapRepo "github.com/mainflux/mainflux/bootstrap/postgres" - pgClient "github.com/mainflux/mainflux/internal/clients/postgres" + "github.com/mainflux/mainflux/bootstrap/postgres" + pgclient "github.com/mainflux/mainflux/internal/clients/postgres" "github.com/mainflux/mainflux/logger" - - dockertest "github.com/ory/dockertest/v3" + "github.com/ory/dockertest/v3" ) var ( @@ -50,7 +49,7 @@ func TestMain(m *testing.M) { testLog.Error(fmt.Sprintf("Could not connect to docker: %s", err)) } - dbConfig := pgClient.Config{ + dbConfig := pgclient.Config{ Host: "localhost", Port: port, User: "test", @@ -62,7 +61,7 @@ func TestMain(m *testing.M) { SSLRootCert: "", } - if db, err = pgClient.SetupDB(dbConfig, *bootstrapRepo.Migration()); err != nil { + if db, err = pgclient.SetupDB(dbConfig, *postgres.Migration()); err != nil { testLog.Error(fmt.Sprintf("Could not setup test DB connection: %s", err)) } diff --git a/bootstrap/redis/producer/setup_test.go b/bootstrap/redis/producer/setup_test.go index 2b82fb325f..9ca35f5d45 100644 --- a/bootstrap/redis/producer/setup_test.go +++ b/bootstrap/redis/producer/setup_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/go-redis/redis/v8" - dockertest "github.com/ory/dockertest/v3" + "github.com/ory/dockertest/v3" ) var redisClient *redis.Client diff --git a/bootstrap/redis/producer/streams_test.go b/bootstrap/redis/producer/streams_test.go index d97b99d633..23b1775955 100644 --- a/bootstrap/redis/producer/streams_test.go +++ b/bootstrap/redis/producer/streams_test.go @@ -15,13 +15,12 @@ import ( "github.com/go-redis/redis/v8" "github.com/go-zoo/bone" - "github.com/mainflux/mainflux/logger" - "github.com/mainflux/mainflux/pkg/errors" - "github.com/mainflux/mainflux/bootstrap" "github.com/mainflux/mainflux/bootstrap/mocks" "github.com/mainflux/mainflux/bootstrap/redis/producer" + "github.com/mainflux/mainflux/logger" mfclients "github.com/mainflux/mainflux/pkg/clients" + "github.com/mainflux/mainflux/pkg/errors" mfgroups "github.com/mainflux/mainflux/pkg/groups" mfsdk "github.com/mainflux/mainflux/pkg/sdk/go" "github.com/mainflux/mainflux/things/clients" diff --git a/bootstrap/service_test.go b/bootstrap/service_test.go index d7a10e1efc..95a3cf5612 100644 --- a/bootstrap/service_test.go +++ b/bootstrap/service_test.go @@ -17,7 +17,6 @@ import ( "testing" "github.com/go-zoo/bone" - "github.com/gofrs/uuid" "github.com/mainflux/mainflux/bootstrap" "github.com/mainflux/mainflux/bootstrap/mocks" diff --git a/certs/mocks/things.go b/certs/mocks/things.go index f5b3763e5d..11c3091da8 100644 --- a/certs/mocks/things.go +++ b/certs/mocks/things.go @@ -62,7 +62,6 @@ func (svc *mainfluxThings) ViewClient(ctx context.Context, token, id string) (mf if t, ok := svc.things[id]; ok && t.Owner == userID.GetId() { return t, nil - } return mfclients.Client{}, errors.ErrNotFound diff --git a/certs/postgres/setup_test.go b/certs/postgres/setup_test.go index 475d90e167..f3d71c31ef 100644 --- a/certs/postgres/setup_test.go +++ b/certs/postgres/setup_test.go @@ -10,9 +10,9 @@ import ( "github.com/jmoiron/sqlx" "github.com/mainflux/mainflux/certs/postgres" - pgClient "github.com/mainflux/mainflux/internal/clients/postgres" + pgclient "github.com/mainflux/mainflux/internal/clients/postgres" "github.com/mainflux/mainflux/logger" - dockertest "github.com/ory/dockertest/v3" + "github.com/ory/dockertest/v3" ) var ( @@ -50,7 +50,7 @@ func TestMain(m *testing.M) { testLog.Error(fmt.Sprintf("Could not connect to docker: %s", err)) } - dbConfig := pgClient.Config{ + dbConfig := pgclient.Config{ Host: "localhost", Port: port, User: "test", @@ -62,7 +62,7 @@ func TestMain(m *testing.M) { SSLRootCert: "", } - if db, err = pgClient.SetupDB(dbConfig, *postgres.Migration()); err != nil { + if db, err = pgclient.SetupDB(dbConfig, *postgres.Migration()); err != nil { testLog.Error(fmt.Sprintf("Could not setup test DB connection: %s", err)) } diff --git a/certs/service_test.go b/certs/service_test.go index 1e7e811b3d..15ddd26389 100644 --- a/certs/service_test.go +++ b/certs/service_test.go @@ -137,7 +137,6 @@ func TestIssueCert(t *testing.T) { assert.True(t, strings.Contains(cert.Subject.CommonName, thingKey), fmt.Sprintf("%s: expected %s got %s\n", tc.desc, tc.err, err)) } } - } func TestRevokeCert(t *testing.T) { @@ -177,7 +176,6 @@ func TestRevokeCert(t *testing.T) { _, err := svc.RevokeCert(context.Background(), tc.token, tc.thingID) assert.True(t, errors.Contains(err, tc.err), fmt.Sprintf("%s: expected %s got %s\n", tc.desc, tc.err, err)) } - } func TestListCerts(t *testing.T) { diff --git a/cli/bootstrap.go b/cli/bootstrap.go index b381eaa98c..5065b3925b 100644 --- a/cli/bootstrap.go +++ b/cli/bootstrap.go @@ -125,7 +125,6 @@ var cmdBootstrap = []cobra.Command{ return } logUsage(cmd.Use) - }, }, { diff --git a/cli/config.go b/cli/config.go index e09f2ce05b..7d8de2805a 100644 --- a/cli/config.go +++ b/cli/config.go @@ -41,7 +41,7 @@ type config struct { } // Readable by all user groups but writeable by the user only. -const filePermission = 0644 +const filePermission = 0o644 var ( errReadFail = errors.New("failed to read config file") @@ -189,7 +189,7 @@ func setConfigValue(key string, value string) error { } } - var configKeyToField = map[string]interface{}{ + configKeyToField := map[string]interface{}{ "things_url": &config.Remotes.ThingsURL, "users_url": &config.Remotes.UsersURL, "reader_url": &config.Remotes.ReaderURL, diff --git a/cli/policies.go b/cli/policies.go index 69560f42e0..9f784f7439 100644 --- a/cli/policies.go +++ b/cli/policies.go @@ -35,7 +35,7 @@ var cmdPolicies = []cobra.Command{ return } - var policy = mfxsdk.Policy{ + policy := mfxsdk.Policy{ Subject: args[1], Object: args[2], Actions: actions, @@ -76,7 +76,7 @@ var cmdPolicies = []cobra.Command{ return } - var policy = mfxsdk.Policy{ + policy := mfxsdk.Policy{ Subject: args[1], Object: args[2], Actions: actions, @@ -150,7 +150,7 @@ var cmdPolicies = []cobra.Command{ return } - var policy = mfxsdk.Policy{ + policy := mfxsdk.Policy{ Subject: args[1], Object: args[2], } @@ -183,7 +183,7 @@ var cmdPolicies = []cobra.Command{ return } - var areq = mfxsdk.AccessRequest{ + areq := mfxsdk.AccessRequest{ Subject: args[1], Object: args[2], Action: args[3], diff --git a/cli/provision.go b/cli/provision.go index 249fc991a8..5dc1f04c62 100644 --- a/cli/provision.go +++ b/cli/provision.go @@ -19,8 +19,10 @@ import ( "github.com/spf13/cobra" ) -const jsonExt = ".json" -const csvExt = ".csv" +const ( + jsonExt = ".json" + csvExt = ".csv" +) var cmdProvision = []cobra.Command{ { diff --git a/cli/users.go b/cli/users.go index 1a64b5234e..e0fff52ec6 100644 --- a/cli/users.go +++ b/cli/users.go @@ -112,7 +112,6 @@ var cmdUsers = []cobra.Command{ } logJSON(token) - }, }, { @@ -134,7 +133,6 @@ var cmdUsers = []cobra.Command{ } logJSON(token) - }, }, { diff --git a/cli/utils.go b/cli/utils.go index 22bf78dbb3..551e186361 100644 --- a/cli/utils.go +++ b/cli/utils.go @@ -10,7 +10,7 @@ import ( "time" "github.com/fatih/color" - prettyjson "github.com/hokaccha/go-prettyjson" + "github.com/hokaccha/go-prettyjson" ) var ( diff --git a/cmd/bootstrap/main.go b/cmd/bootstrap/main.go index cbea2e15c4..b7090098a7 100644 --- a/cmd/bootstrap/main.go +++ b/cmd/bootstrap/main.go @@ -16,15 +16,15 @@ import ( "github.com/mainflux/mainflux" "github.com/mainflux/mainflux/bootstrap" "github.com/mainflux/mainflux/bootstrap/api" - bootstrapPg "github.com/mainflux/mainflux/bootstrap/postgres" - rediscons "github.com/mainflux/mainflux/bootstrap/redis/consumer" - redisprod "github.com/mainflux/mainflux/bootstrap/redis/producer" + bootstrappg "github.com/mainflux/mainflux/bootstrap/postgres" + "github.com/mainflux/mainflux/bootstrap/redis/consumer" + "github.com/mainflux/mainflux/bootstrap/redis/producer" "github.com/mainflux/mainflux/bootstrap/tracing" "github.com/mainflux/mainflux/internal" - authClient "github.com/mainflux/mainflux/internal/clients/grpc/auth" - jaegerClient "github.com/mainflux/mainflux/internal/clients/jaeger" - pgClient "github.com/mainflux/mainflux/internal/clients/postgres" - redisClient "github.com/mainflux/mainflux/internal/clients/redis" + authclient "github.com/mainflux/mainflux/internal/clients/grpc/auth" + "github.com/mainflux/mainflux/internal/clients/jaeger" + pgclient "github.com/mainflux/mainflux/internal/clients/postgres" + redisclient "github.com/mainflux/mainflux/internal/clients/redis" "github.com/mainflux/mainflux/internal/env" "github.com/mainflux/mainflux/internal/postgres" "github.com/mainflux/mainflux/internal/server" @@ -82,11 +82,11 @@ func main() { } // Create new postgres client - dbConfig := pgClient.Config{Name: defDB} + dbConfig := pgclient.Config{Name: defDB} if err := dbConfig.LoadEnv(envPrefixDB); err != nil { logger.Fatal(err.Error()) } - db, err := pgClient.SetupWithConfig(envPrefixDB, *bootstrapPg.Migration(), dbConfig) + db, err := pgclient.SetupWithConfig(envPrefixDB, *bootstrappg.Migration(), dbConfig) if err != nil { logger.Error(err.Error()) exitCode = 1 @@ -95,7 +95,7 @@ func main() { defer db.Close() // Create new redis client for bootstrap event store - esClient, err := redisClient.Setup(envPrefixES) + esClient, err := redisclient.Setup(envPrefixES) if err != nil { logger.Error(fmt.Sprintf("failed to setup %s bootstrap event store redis client : %s", svcName, err)) exitCode = 1 @@ -104,7 +104,7 @@ func main() { defer esClient.Close() // Create new auth grpc client api - auth, authHandler, err := authClient.Setup(svcName) + auth, authHandler, err := authclient.Setup(svcName) if err != nil { logger.Error(err.Error()) exitCode = 1 @@ -113,7 +113,7 @@ func main() { defer authHandler.Close() logger.Info("Successfully connected to auth grpc server " + authHandler.Secure()) - tp, err := jaegerClient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) + tp, err := jaeger.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) if err != nil { logger.Error(fmt.Sprintf("failed to init Jaeger: %s", err)) exitCode = 1 @@ -151,7 +151,7 @@ func main() { }) // Subscribe to things event store - thingsESClient, err := redisClient.Setup(envPrefixES) + thingsESClient, err := redisclient.Setup(envPrefixES) if err != nil { logger.Fatal(err.Error()) } @@ -164,10 +164,10 @@ func main() { } } -func newService(ctx context.Context, auth policies.AuthServiceClient, db *sqlx.DB, tracer trace.Tracer, logger mflog.Logger, esClient *redis.Client, cfg config, dbConfig pgClient.Config) bootstrap.Service { +func newService(ctx context.Context, auth policies.AuthServiceClient, db *sqlx.DB, tracer trace.Tracer, logger mflog.Logger, esClient *redis.Client, cfg config, dbConfig pgclient.Config) bootstrap.Service { database := postgres.NewDatabase(db, dbConfig, tracer) - repoConfig := bootstrapPg.NewConfigRepository(database, logger) + repoConfig := bootstrappg.NewConfigRepository(database, logger) config := mfsdk.Config{ ThingsURL: cfg.ThingsURL, @@ -176,7 +176,7 @@ func newService(ctx context.Context, auth policies.AuthServiceClient, db *sqlx.D sdk := mfsdk.NewSDK(config) svc := bootstrap.New(auth, repoConfig, sdk, []byte(cfg.EncKey)) - svc = redisprod.NewEventStoreMiddleware(ctx, svc, esClient) + svc = producer.NewEventStoreMiddleware(ctx, svc, esClient) svc = api.LoggingMiddleware(svc, logger) counter, latency := internal.MakeMetrics(svcName, "api") svc = api.MetricsMiddleware(svc, counter, latency) @@ -185,8 +185,8 @@ func newService(ctx context.Context, auth policies.AuthServiceClient, db *sqlx.D return svc } -func subscribeToThingsES(ctx context.Context, svc bootstrap.Service, client *redis.Client, consumer string, logger mflog.Logger) { - eventStore := rediscons.NewEventStore(svc, client, consumer, logger) +func subscribeToThingsES(ctx context.Context, svc bootstrap.Service, client *redis.Client, consumers string, logger mflog.Logger) { + eventStore := consumer.NewEventStore(svc, client, consumers, logger) logger.Info("Subscribed to Redis Event Store") if err := eventStore.Subscribe(ctx, "mainflux.things"); err != nil { logger.Warn(fmt.Sprintf("Bootstrap service failed to subscribe to event sourcing: %s", err)) diff --git a/cmd/cassandra-reader/main.go b/cmd/cassandra-reader/main.go index f7f63c0168..b1e5bd6828 100644 --- a/cmd/cassandra-reader/main.go +++ b/cmd/cassandra-reader/main.go @@ -14,9 +14,9 @@ import ( chclient "github.com/mainflux/callhome/pkg/client" "github.com/mainflux/mainflux" "github.com/mainflux/mainflux/internal" - cassandraClient "github.com/mainflux/mainflux/internal/clients/cassandra" - authClient "github.com/mainflux/mainflux/internal/clients/grpc/auth" - thingsClient "github.com/mainflux/mainflux/internal/clients/grpc/things" + cassandraclient "github.com/mainflux/mainflux/internal/clients/cassandra" + authclient "github.com/mainflux/mainflux/internal/clients/grpc/auth" + thingsclient "github.com/mainflux/mainflux/internal/clients/grpc/things" "github.com/mainflux/mainflux/internal/env" "github.com/mainflux/mainflux/internal/server" httpserver "github.com/mainflux/mainflux/internal/server/http" @@ -68,7 +68,7 @@ func main() { } // Create new thing grpc client - tc, tcHandler, err := thingsClient.Setup() + tc, tcHandler, err := thingsclient.Setup() if err != nil { logger.Error(err.Error()) exitCode = 1 @@ -79,7 +79,7 @@ func main() { logger.Info("Successfully connected to things grpc server " + tcHandler.Secure()) // Create new auth grpc client - auth, authHandler, err := authClient.Setup(svcName) + auth, authHandler, err := authclient.Setup(svcName) if err != nil { logger.Error(err.Error()) exitCode = 1 @@ -90,7 +90,7 @@ func main() { logger.Info("Successfully connected to auth grpc server " + authHandler.Secure()) // Create new cassandra client - csdSession, err := cassandraClient.Setup(envPrefixDB) + csdSession, err := cassandraclient.Setup(envPrefixDB) if err != nil { logger.Error(err.Error()) exitCode = 1 diff --git a/cmd/cassandra-writer/main.go b/cmd/cassandra-writer/main.go index 5c2d9ec73f..ad7758c108 100644 --- a/cmd/cassandra-writer/main.go +++ b/cmd/cassandra-writer/main.go @@ -10,17 +10,16 @@ import ( "log" "os" + "github.com/gocql/gocql" chclient "github.com/mainflux/callhome/pkg/client" "github.com/mainflux/mainflux" - - "github.com/gocql/gocql" "github.com/mainflux/mainflux/consumers" - consumerTracing "github.com/mainflux/mainflux/consumers/tracing" + consumertracing "github.com/mainflux/mainflux/consumers/tracing" "github.com/mainflux/mainflux/consumers/writers/api" "github.com/mainflux/mainflux/consumers/writers/cassandra" "github.com/mainflux/mainflux/internal" - cassandraClient "github.com/mainflux/mainflux/internal/clients/cassandra" - jaegerClient "github.com/mainflux/mainflux/internal/clients/jaeger" + cassandraclient "github.com/mainflux/mainflux/internal/clients/cassandra" + jaegerclient "github.com/mainflux/mainflux/internal/clients/jaeger" "github.com/mainflux/mainflux/internal/env" "github.com/mainflux/mainflux/internal/server" httpserver "github.com/mainflux/mainflux/internal/server/http" @@ -81,7 +80,7 @@ func main() { } // Create new to cassandra client - csdSession, err := cassandraClient.SetupDB(envPrefixDB, cassandra.Table) + csdSession, err := cassandraclient.SetupDB(envPrefixDB, cassandra.Table) if err != nil { logger.Error(err.Error()) exitCode = 1 @@ -89,7 +88,7 @@ func main() { } defer csdSession.Close() - tp, err := jaegerClient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) + tp, err := jaegerclient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) if err != nil { logger.Error(fmt.Sprintf("Failed to init Jaeger: %s", err)) exitCode = 1 @@ -104,7 +103,7 @@ func main() { // Create new cassandra-writer repo repo := newService(csdSession, logger) - repo = consumerTracing.NewBlocking(tracer, repo, httpServerConfig) + repo = consumertracing.NewBlocking(tracer, repo, httpServerConfig) // Create new pub sub broker pubSub, err := brokers.NewPubSub(cfg.BrokerURL, "", logger) @@ -142,7 +141,6 @@ func main() { if err := g.Wait(); err != nil { logger.Error(fmt.Sprintf("Cassandra writer service terminated: %s", err)) } - } func newService(session *gocql.Session, logger mflog.Logger) consumers.BlockingConsumer { diff --git a/cmd/certs/main.go b/cmd/certs/main.go index 363e7e9612..ae92ff4c35 100644 --- a/cmd/certs/main.go +++ b/cmd/certs/main.go @@ -16,12 +16,12 @@ import ( "github.com/mainflux/mainflux/certs" "github.com/mainflux/mainflux/certs/api" vault "github.com/mainflux/mainflux/certs/pki" - certsPg "github.com/mainflux/mainflux/certs/postgres" + certspg "github.com/mainflux/mainflux/certs/postgres" "github.com/mainflux/mainflux/certs/tracing" "github.com/mainflux/mainflux/internal" - authClient "github.com/mainflux/mainflux/internal/clients/grpc/auth" - jaegerClient "github.com/mainflux/mainflux/internal/clients/jaeger" - pgClient "github.com/mainflux/mainflux/internal/clients/postgres" + authclient "github.com/mainflux/mainflux/internal/clients/grpc/auth" + jaegerclient "github.com/mainflux/mainflux/internal/clients/jaeger" + pgclient "github.com/mainflux/mainflux/internal/clients/postgres" "github.com/mainflux/mainflux/internal/env" "github.com/mainflux/mainflux/internal/postgres" "github.com/mainflux/mainflux/internal/server" @@ -92,18 +92,18 @@ func main() { return } - pkiClient, err := vault.NewVaultClient(cfg.PkiToken, cfg.PkiHost, cfg.PkiPath, cfg.PkiRole) + pkiclient, err := vault.NewVaultClient(cfg.PkiToken, cfg.PkiHost, cfg.PkiPath, cfg.PkiRole) if err != nil { logger.Error("failed to configure client for PKI engine") exitCode = 1 return } - dbConfig := pgClient.Config{Name: defDB} + dbConfig := pgclient.Config{Name: defDB} if err := dbConfig.LoadEnv(envPrefixDB); err != nil { logger.Fatal(fmt.Sprintf("failed to load %s database configuration : %s", svcName, err)) } - db, err := pgClient.SetupWithConfig(envPrefixDB, *certsPg.Migration(), dbConfig) + db, err := pgclient.SetupWithConfig(envPrefixDB, *certspg.Migration(), dbConfig) if err != nil { logger.Error(err.Error()) exitCode = 1 @@ -111,7 +111,7 @@ func main() { } defer db.Close() - auth, authHandler, err := authClient.Setup(svcName) + auth, authHandler, err := authclient.Setup(svcName) if err != nil { logger.Error(err.Error()) exitCode = 1 @@ -121,7 +121,7 @@ func main() { logger.Info("Successfully connected to auth grpc server " + authHandler.Secure()) - tp, err := jaegerClient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) + tp, err := jaegerclient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) if err != nil { logger.Error(fmt.Sprintf("failed to init Jaeger: %s", err)) exitCode = 1 @@ -134,7 +134,7 @@ func main() { }() tracer := tp.Tracer(svcName) - svc := newService(auth, db, tracer, logger, cfg, dbConfig, pkiClient) + svc := newService(auth, db, tracer, logger, cfg, dbConfig, pkiclient) httpServerConfig := server.Config{Port: defSvcHTTPPort} if err := env.Parse(&httpServerConfig, env.Options{Prefix: envPrefixHTTP}); err != nil { @@ -162,9 +162,9 @@ func main() { } } -func newService(auth policies.AuthServiceClient, db *sqlx.DB, tracer trace.Tracer, logger mflog.Logger, cfg config, dbConfig pgClient.Config, pkiAgent vault.Agent) certs.Service { +func newService(auth policies.AuthServiceClient, db *sqlx.DB, tracer trace.Tracer, logger mflog.Logger, cfg config, dbConfig pgclient.Config, pkiAgent vault.Agent) certs.Service { database := postgres.NewDatabase(db, dbConfig, tracer) - certsRepo := certsPg.NewRepository(database, logger) + certsRepo := certspg.NewRepository(database, logger) config := mfsdk.Config{ CertsURL: cfg.CertsURL, ThingsURL: cfg.ThingsURL, diff --git a/cmd/cli/main.go b/cmd/cli/main.go index a329d3c2e0..dc43d2453f 100644 --- a/cmd/cli/main.go +++ b/cmd/cli/main.go @@ -36,7 +36,7 @@ func main() { } // Root - var rootCmd = &cobra.Command{ + rootCmd := &cobra.Command{ Use: "mainflux-cli", PersistentPreRun: func(cmd *cobra.Command, args []string) { cliConf, err := cli.ParseConfig(sdkConf) diff --git a/cmd/coap/main.go b/cmd/coap/main.go index abbcb3f203..586a1a90b2 100644 --- a/cmd/coap/main.go +++ b/cmd/coap/main.go @@ -16,8 +16,8 @@ import ( "github.com/mainflux/mainflux/coap/api" "github.com/mainflux/mainflux/coap/tracing" "github.com/mainflux/mainflux/internal" - thingsClient "github.com/mainflux/mainflux/internal/clients/grpc/things" - jaegerClient "github.com/mainflux/mainflux/internal/clients/jaeger" + thingsclient "github.com/mainflux/mainflux/internal/clients/grpc/things" + jaegerclient "github.com/mainflux/mainflux/internal/clients/jaeger" "github.com/mainflux/mainflux/internal/env" "github.com/mainflux/mainflux/internal/server" coapserver "github.com/mainflux/mainflux/internal/server/coap" @@ -84,7 +84,7 @@ func main() { return } - tc, tcHandler, err := thingsClient.Setup() + tc, tcHandler, err := thingsclient.Setup() if err != nil { logger.Error(err.Error()) exitCode = 1 @@ -94,7 +94,7 @@ func main() { logger.Info("Successfully connected to things grpc server " + tcHandler.Secure()) - tp, err := jaegerClient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) + tp, err := jaegerclient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) if err != nil { logger.Error(fmt.Sprintf("Failed to init Jaeger: %s", err)) exitCode = 1 diff --git a/cmd/http/main.go b/cmd/http/main.go index 91fdfdc95d..d2b508b878 100644 --- a/cmd/http/main.go +++ b/cmd/http/main.go @@ -16,8 +16,8 @@ import ( "github.com/mainflux/mainflux/http/api" "github.com/mainflux/mainflux/http/tracing" "github.com/mainflux/mainflux/internal" - thingsClient "github.com/mainflux/mainflux/internal/clients/grpc/things" - jaegerClient "github.com/mainflux/mainflux/internal/clients/jaeger" + thingsclient "github.com/mainflux/mainflux/internal/clients/grpc/things" + jaegerclient "github.com/mainflux/mainflux/internal/clients/jaeger" "github.com/mainflux/mainflux/internal/env" "github.com/mainflux/mainflux/internal/server" httpserver "github.com/mainflux/mainflux/internal/server/http" @@ -77,7 +77,7 @@ func main() { return } - tc, tcHandler, err := thingsClient.Setup() + tc, tcHandler, err := thingsclient.Setup() if err != nil { logger.Error(err.Error()) exitCode = 1 @@ -87,7 +87,7 @@ func main() { logger.Info("Successfully connected to things grpc server " + tcHandler.Secure()) - tp, err := jaegerClient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) + tp, err := jaegerclient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) if err != nil { logger.Error(fmt.Sprintf("Failed to init Jaeger: %s", err)) exitCode = 1 diff --git a/cmd/influxdb-reader/main.go b/cmd/influxdb-reader/main.go index 1f426904f3..f2e3d4a8de 100644 --- a/cmd/influxdb-reader/main.go +++ b/cmd/influxdb-reader/main.go @@ -10,14 +10,13 @@ import ( "log" "os" + influxdb2 "github.com/influxdata/influxdb-client-go/v2" chclient "github.com/mainflux/callhome/pkg/client" "github.com/mainflux/mainflux" - - influxdb2 "github.com/influxdata/influxdb-client-go/v2" "github.com/mainflux/mainflux/internal" - authClient "github.com/mainflux/mainflux/internal/clients/grpc/auth" - thingsClient "github.com/mainflux/mainflux/internal/clients/grpc/things" - influxDBClient "github.com/mainflux/mainflux/internal/clients/influxdb" + authclient "github.com/mainflux/mainflux/internal/clients/grpc/auth" + thingsclient "github.com/mainflux/mainflux/internal/clients/grpc/things" + influxdbclient "github.com/mainflux/mainflux/internal/clients/influxdb" "github.com/mainflux/mainflux/internal/env" "github.com/mainflux/mainflux/internal/server" httpserver "github.com/mainflux/mainflux/internal/server/http" @@ -67,7 +66,7 @@ func main() { } } - tc, tcHandler, err := thingsClient.Setup() + tc, tcHandler, err := thingsclient.Setup() if err != nil { logger.Error(err.Error()) exitCode = 1 @@ -77,7 +76,7 @@ func main() { logger.Info("Successfully connected to things grpc server " + tcHandler.Secure()) - auth, authHandler, err := authClient.Setup(svcName) + auth, authHandler, err := authclient.Setup(svcName) if err != nil { logger.Error(err.Error()) exitCode = 1 @@ -87,7 +86,7 @@ func main() { logger.Info("Successfully connected to auth grpc server " + authHandler.Secure()) - influxDBConfig := influxDBClient.Config{} + influxDBConfig := influxdbclient.Config{} if err := env.Parse(&influxDBConfig, env.Options{Prefix: envPrefixDB}); err != nil { logger.Error(fmt.Sprintf("failed to load InfluxDB client configuration from environment variable : %s", err)) exitCode = 1 @@ -100,7 +99,7 @@ func main() { Org: influxDBConfig.Org, } - client, err := influxDBClient.Connect(ctx, influxDBConfig) + client, err := influxdbclient.Connect(ctx, influxDBConfig) if err != nil { logger.Error(fmt.Sprintf("failed to connect to InfluxDB : %s", err)) exitCode = 1 diff --git a/cmd/influxdb-writer/main.go b/cmd/influxdb-writer/main.go index f7957c60e1..92177b7e53 100644 --- a/cmd/influxdb-writer/main.go +++ b/cmd/influxdb-writer/main.go @@ -13,11 +13,11 @@ import ( chclient "github.com/mainflux/callhome/pkg/client" "github.com/mainflux/mainflux" "github.com/mainflux/mainflux/consumers" - consumerTracing "github.com/mainflux/mainflux/consumers/tracing" + consumertracing "github.com/mainflux/mainflux/consumers/tracing" "github.com/mainflux/mainflux/consumers/writers/api" "github.com/mainflux/mainflux/consumers/writers/influxdb" - influxDBClient "github.com/mainflux/mainflux/internal/clients/influxdb" - jaegerClient "github.com/mainflux/mainflux/internal/clients/jaeger" + influxdbclient "github.com/mainflux/mainflux/internal/clients/influxdb" + "github.com/mainflux/mainflux/internal/clients/jaeger" "github.com/mainflux/mainflux/internal/env" "github.com/mainflux/mainflux/internal/server" httpserver "github.com/mainflux/mainflux/internal/server/http" @@ -76,7 +76,7 @@ func main() { return } - tp, err := jaegerClient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) + tp, err := jaeger.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) if err != nil { logger.Error(fmt.Sprintf("Failed to init Jaeger: %s", err)) exitCode = 1 @@ -98,7 +98,7 @@ func main() { defer pubSub.Close() pubSub = brokerstracing.NewPubSub(httpServerConfig, tracer, pubSub) - influxDBConfig := influxDBClient.Config{} + influxDBConfig := influxdbclient.Config{} if err := env.Parse(&influxDBConfig, env.Options{Prefix: envPrefixDB}); err != nil { logger.Error(fmt.Sprintf("failed to load InfluxDB client configuration from environment variable : %s", err)) exitCode = 1 @@ -111,7 +111,7 @@ func main() { Org: influxDBConfig.Org, } - client, err := influxDBClient.Connect(ctx, influxDBConfig) + client, err := influxdbclient.Connect(ctx, influxDBConfig) if err != nil { logger.Error(fmt.Sprintf("failed to connect to InfluxDB : %s", err)) exitCode = 1 @@ -120,7 +120,7 @@ func main() { defer client.Close() repo := influxdb.NewAsync(client, repocfg) - repo = consumerTracing.NewAsync(tracer, repo, httpServerConfig) + repo = consumertracing.NewAsync(tracer, repo, httpServerConfig) // Start consuming and logging errors. go func(log mflog.Logger) { diff --git a/cmd/lora/main.go b/cmd/lora/main.go index 3059301ed7..7ff76ccc76 100644 --- a/cmd/lora/main.go +++ b/cmd/lora/main.go @@ -11,13 +11,13 @@ import ( "os" "time" - mqttPaho "github.com/eclipse/paho.mqtt.golang" - r "github.com/go-redis/redis/v8" + mqttpaho "github.com/eclipse/paho.mqtt.golang" + "github.com/go-redis/redis/v8" chclient "github.com/mainflux/callhome/pkg/client" "github.com/mainflux/mainflux" "github.com/mainflux/mainflux/internal" - jaegerClient "github.com/mainflux/mainflux/internal/clients/jaeger" - redisClient "github.com/mainflux/mainflux/internal/clients/redis" + "github.com/mainflux/mainflux/internal/clients/jaeger" + redisclient "github.com/mainflux/mainflux/internal/clients/redis" "github.com/mainflux/mainflux/internal/env" "github.com/mainflux/mainflux/internal/server" httpserver "github.com/mainflux/mainflux/internal/server/http" @@ -25,7 +25,7 @@ import ( "github.com/mainflux/mainflux/lora" "github.com/mainflux/mainflux/lora/api" "github.com/mainflux/mainflux/lora/mqtt" - "github.com/mainflux/mainflux/lora/redis" + loraredis "github.com/mainflux/mainflux/lora/redis" "github.com/mainflux/mainflux/pkg/messaging" "github.com/mainflux/mainflux/pkg/messaging/brokers" brokerstracing "github.com/mainflux/mainflux/pkg/messaging/brokers/tracing" @@ -91,7 +91,7 @@ func main() { return } - rmConn, err := redisClient.Setup(envPrefixRouteMap) + rmConn, err := redisclient.Setup(envPrefixRouteMap) if err != nil { logger.Error(fmt.Sprintf("failed to setup route map redis client : %s", err)) exitCode = 1 @@ -99,7 +99,7 @@ func main() { } defer rmConn.Close() - tp, err := jaegerClient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) + tp, err := jaeger.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) if err != nil { logger.Error(fmt.Sprintf("Failed to init Jaeger: %s", err)) exitCode = 1 @@ -123,7 +123,7 @@ func main() { svc := newService(pub, rmConn, thingsRMPrefix, channelsRMPrefix, connsRMPrefix, logger) - esConn, err := redisClient.Setup(envPrefixThingsES) + esConn, err := redisclient.Setup(envPrefixThingsES) if err != nil { logger.Error(fmt.Sprintf("failed to setup things event store redis client : %s", err)) exitCode = 1 @@ -164,19 +164,19 @@ func main() { } } -func connectToMQTTBroker(url, user, password string, timeout time.Duration, logger mflog.Logger) (mqttPaho.Client, error) { - opts := mqttPaho.NewClientOptions() +func connectToMQTTBroker(url, user, password string, timeout time.Duration, logger mflog.Logger) (mqttpaho.Client, error) { + opts := mqttpaho.NewClientOptions() opts.AddBroker(url) opts.SetUsername(user) opts.SetPassword(password) - opts.SetOnConnectHandler(func(_ mqttPaho.Client) { + opts.SetOnConnectHandler(func(_ mqttpaho.Client) { logger.Info("Connected to Lora MQTT broker") }) - opts.SetConnectionLostHandler(func(c mqttPaho.Client, err error) { + opts.SetConnectionLostHandler(func(c mqttpaho.Client, err error) { logger.Error(fmt.Sprintf("MQTT connection lost: %s", err)) }) - client := mqttPaho.NewClient(opts) + client := mqttpaho.NewClient(opts) if token := client.Connect(); token.WaitTimeout(timeout) && token.Error() != nil { return nil, fmt.Errorf("failed to connect to Lora MQTT broker: %s", token.Error()) @@ -185,7 +185,7 @@ func connectToMQTTBroker(url, user, password string, timeout time.Duration, logg return client, nil } -func subscribeToLoRaBroker(svc lora.Service, mc mqttPaho.Client, timeout time.Duration, topic string, logger mflog.Logger) error { +func subscribeToLoRaBroker(svc lora.Service, mc mqttpaho.Client, timeout time.Duration, topic string, logger mflog.Logger) error { mqtt := mqtt.NewBroker(svc, mc, timeout, logger) logger.Info("Subscribed to Lora MQTT broker") if err := mqtt.Subscribe(topic); err != nil { @@ -194,20 +194,20 @@ func subscribeToLoRaBroker(svc lora.Service, mc mqttPaho.Client, timeout time.Du return nil } -func subscribeToThingsES(ctx context.Context, svc lora.Service, client *r.Client, consumer string, logger mflog.Logger) { - eventStore := redis.NewEventStore(svc, client, consumer, logger) +func subscribeToThingsES(ctx context.Context, svc lora.Service, client *redis.Client, consumer string, logger mflog.Logger) { + eventStore := loraredis.NewEventStore(svc, client, consumer, logger) logger.Info("Subscribed to Redis Event Store") if err := eventStore.Subscribe(ctx, "mainflux.things"); err != nil { logger.Warn(fmt.Sprintf("Lora-adapter service failed to subscribe to Redis event source: %s", err)) } } -func newRouteMapRepository(client *r.Client, prefix string, logger mflog.Logger) lora.RouteMapRepository { +func newRouteMapRepository(client *redis.Client, prefix string, logger mflog.Logger) lora.RouteMapRepository { logger.Info(fmt.Sprintf("Connected to %s Redis Route-map", prefix)) - return redis.NewRouteMapRepository(client, prefix) + return loraredis.NewRouteMapRepository(client, prefix) } -func newService(pub messaging.Publisher, rmConn *r.Client, thingsRMPrefix, channelsRMPrefix, connsRMPrefix string, logger mflog.Logger) lora.Service { +func newService(pub messaging.Publisher, rmConn *redis.Client, thingsRMPrefix, channelsRMPrefix, connsRMPrefix string, logger mflog.Logger) lora.Service { thingsRM := newRouteMapRepository(rmConn, thingsRMPrefix, logger) chansRM := newRouteMapRepository(rmConn, channelsRMPrefix, logger) connsRM := newRouteMapRepository(rmConn, connsRMPrefix, logger) diff --git a/cmd/mongodb-reader/main.go b/cmd/mongodb-reader/main.go index 23691be6da..c23559e967 100644 --- a/cmd/mongodb-reader/main.go +++ b/cmd/mongodb-reader/main.go @@ -13,9 +13,9 @@ import ( chclient "github.com/mainflux/callhome/pkg/client" "github.com/mainflux/mainflux" "github.com/mainflux/mainflux/internal" - authClient "github.com/mainflux/mainflux/internal/clients/grpc/auth" - thingsClient "github.com/mainflux/mainflux/internal/clients/grpc/things" - mongoClient "github.com/mainflux/mainflux/internal/clients/mongo" + authclient "github.com/mainflux/mainflux/internal/clients/grpc/auth" + thingsclient "github.com/mainflux/mainflux/internal/clients/grpc/things" + mongoclient "github.com/mainflux/mainflux/internal/clients/mongo" "github.com/mainflux/mainflux/internal/env" "github.com/mainflux/mainflux/internal/server" httpserver "github.com/mainflux/mainflux/internal/server/http" @@ -66,7 +66,7 @@ func main() { } } - db, err := mongoClient.Setup(envPrefixDB) + db, err := mongoclient.Setup(envPrefixDB) if err != nil { logger.Error(fmt.Sprintf("failed to setup mongo database : %s", err)) exitCode = 1 @@ -75,7 +75,7 @@ func main() { repo := newService(db, logger) - tc, tcHandler, err := thingsClient.Setup() + tc, tcHandler, err := thingsclient.Setup() if err != nil { logger.Error(err.Error()) exitCode = 1 @@ -85,7 +85,7 @@ func main() { logger.Info("Successfully connected to things grpc server " + tcHandler.Secure()) - auth, authHandler, err := authClient.Setup(svcName) + auth, authHandler, err := authclient.Setup(svcName) if err != nil { logger.Fatal(err.Error()) exitCode = 1 diff --git a/cmd/mongodb-writer/main.go b/cmd/mongodb-writer/main.go index 9dde7f50af..8771cec51d 100644 --- a/cmd/mongodb-writer/main.go +++ b/cmd/mongodb-writer/main.go @@ -13,12 +13,12 @@ import ( chclient "github.com/mainflux/callhome/pkg/client" "github.com/mainflux/mainflux" "github.com/mainflux/mainflux/consumers" - consumerTracing "github.com/mainflux/mainflux/consumers/tracing" + consumertracing "github.com/mainflux/mainflux/consumers/tracing" "github.com/mainflux/mainflux/consumers/writers/api" "github.com/mainflux/mainflux/consumers/writers/mongodb" "github.com/mainflux/mainflux/internal" - jaegerClient "github.com/mainflux/mainflux/internal/clients/jaeger" - mongoClient "github.com/mainflux/mainflux/internal/clients/mongo" + jaegerclient "github.com/mainflux/mainflux/internal/clients/jaeger" + mongoclient "github.com/mainflux/mainflux/internal/clients/mongo" "github.com/mainflux/mainflux/internal/env" "github.com/mainflux/mainflux/internal/server" httpserver "github.com/mainflux/mainflux/internal/server/http" @@ -78,7 +78,7 @@ func main() { return } - tp, err := jaegerClient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) + tp, err := jaegerclient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) if err != nil { logger.Error(fmt.Sprintf("Failed to init Jaeger: %s", err)) exitCode = 1 @@ -100,7 +100,7 @@ func main() { defer pubSub.Close() pubSub = brokerstracing.NewPubSub(httpServerConfig, tracer, pubSub) - db, err := mongoClient.Setup(envPrefixDB) + db, err := mongoclient.Setup(envPrefixDB) if err != nil { logger.Error(fmt.Sprintf("failed to setup mongo database : %s", err)) exitCode = 1 @@ -108,7 +108,7 @@ func main() { } repo := newService(db, logger) - repo = consumerTracing.NewBlocking(tracer, repo, httpServerConfig) + repo = consumertracing.NewBlocking(tracer, repo, httpServerConfig) if err := consumers.Start(ctx, svcName, pubSub, repo, cfg.ConfigPath, logger); err != nil { logger.Error(fmt.Sprintf("failed to start MongoDB writer: %s", err)) diff --git a/cmd/mqtt/main.go b/cmd/mqtt/main.go index c2abe1c378..49d55b1c8d 100644 --- a/cmd/mqtt/main.go +++ b/cmd/mqtt/main.go @@ -16,9 +16,9 @@ import ( "github.com/cenkalti/backoff/v4" chclient "github.com/mainflux/callhome/pkg/client" "github.com/mainflux/mainflux" - thingsClient "github.com/mainflux/mainflux/internal/clients/grpc/things" - jaegerClient "github.com/mainflux/mainflux/internal/clients/jaeger" - redisClient "github.com/mainflux/mainflux/internal/clients/redis" + thingsclient "github.com/mainflux/mainflux/internal/clients/grpc/things" + jaegerclient "github.com/mainflux/mainflux/internal/clients/jaeger" + redisclient "github.com/mainflux/mainflux/internal/clients/redis" "github.com/mainflux/mainflux/internal/env" "github.com/mainflux/mainflux/internal/server" mflog "github.com/mainflux/mainflux/logger" @@ -33,7 +33,7 @@ import ( "github.com/mainflux/mainflux/pkg/uuid" mp "github.com/mainflux/mproxy/pkg/mqtt" "github.com/mainflux/mproxy/pkg/session" - ws "github.com/mainflux/mproxy/pkg/websocket" + "github.com/mainflux/mproxy/pkg/websocket" "golang.org/x/sync/errgroup" ) @@ -103,7 +103,7 @@ func main() { Port: cfg.HTTPTargetPort, } - tp, err := jaegerClient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) + tp, err := jaegerclient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) if err != nil { logger.Error(fmt.Sprintf("Failed to init Jaeger: %s", err)) exitCode = 1 @@ -150,7 +150,7 @@ func main() { defer np.Close() np = brokerstracing.NewPublisher(serverConfig, tracer, np) - ec, err := redisClient.Setup(envPrefixES) + ec, err := redisclient.Setup(envPrefixES) if err != nil { logger.Error(fmt.Sprintf("failed to setup %s event store redis client : %s", svcName, err)) exitCode = 1 @@ -160,7 +160,7 @@ func main() { es := mqttredis.NewEventStore(ctx, ec, cfg.Instance) - tc, tcHandler, err := thingsClient.Setup() + tc, tcHandler, err := thingsclient.Setup() if err != nil { logger.Error(err.Error()) exitCode = 1 @@ -222,7 +222,7 @@ func proxyMQTT(ctx context.Context, cfg config, logger mflog.Logger, handler ses func proxyWS(ctx context.Context, cfg config, logger mflog.Logger, handler session.Handler) error { target := fmt.Sprintf("%s:%s", cfg.HTTPTargetHost, cfg.HTTPTargetPort) - wp := ws.New(target, cfg.HTTPTargetPath, "ws", handler, logger) + wp := websocket.New(target, cfg.HTTPTargetPath, "ws", handler, logger) http.Handle("/mqtt", wp.Handler()) errCh := make(chan error) diff --git a/cmd/opcua/main.go b/cmd/opcua/main.go index d8e4ab1e68..1761c11878 100644 --- a/cmd/opcua/main.go +++ b/cmd/opcua/main.go @@ -10,12 +10,12 @@ import ( "log" "os" - r "github.com/go-redis/redis/v8" + "github.com/go-redis/redis/v8" chclient "github.com/mainflux/callhome/pkg/client" "github.com/mainflux/mainflux" "github.com/mainflux/mainflux/internal" - jaegerClient "github.com/mainflux/mainflux/internal/clients/jaeger" - redisClient "github.com/mainflux/mainflux/internal/clients/redis" + jaegerclient "github.com/mainflux/mainflux/internal/clients/jaeger" + redisclient "github.com/mainflux/mainflux/internal/clients/redis" "github.com/mainflux/mainflux/internal/env" "github.com/mainflux/mainflux/internal/server" httpserver "github.com/mainflux/mainflux/internal/server/http" @@ -24,7 +24,7 @@ import ( "github.com/mainflux/mainflux/opcua/api" "github.com/mainflux/mainflux/opcua/db" "github.com/mainflux/mainflux/opcua/gopcua" - "github.com/mainflux/mainflux/opcua/redis" + opcuaredis "github.com/mainflux/mainflux/opcua/redis" "github.com/mainflux/mainflux/pkg/messaging/brokers" brokerstracing "github.com/mainflux/mainflux/pkg/messaging/brokers/tracing" "github.com/mainflux/mainflux/pkg/uuid" @@ -89,7 +89,7 @@ func main() { return } - rmConn, err := redisClient.Setup(envPrefixRouteMap) + rmConn, err := redisclient.Setup(envPrefixRouteMap) if err != nil { logger.Error(fmt.Sprintf("failed to setup %s bootstrap event store redis client : %s", svcName, err)) exitCode = 1 @@ -101,7 +101,7 @@ func main() { chanRM := newRouteMapRepositoy(rmConn, channelsRMPrefix, logger) connRM := newRouteMapRepositoy(rmConn, connectionRMPrefix, logger) - esConn, err := redisClient.Setup(envPrefixES) + esConn, err := redisclient.Setup(envPrefixES) if err != nil { logger.Error(fmt.Sprintf("failed to setup %s bootstrap event store redis client : %s", svcName, err)) exitCode = 1 @@ -109,7 +109,7 @@ func main() { } defer esConn.Close() - tp, err := jaegerClient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) + tp, err := jaegerclient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) if err != nil { logger.Error(fmt.Sprintf("Failed to init Jaeger: %s", err)) exitCode = 1 @@ -177,16 +177,16 @@ func subscribeToStoredSubs(ctx context.Context, sub opcua.Subscriber, cfg opcua. } } -func subscribeToThingsES(ctx context.Context, svc opcua.Service, client *r.Client, prefix string, logger mflog.Logger) { - eventStore := redis.NewEventStore(svc, client, prefix, logger) +func subscribeToThingsES(ctx context.Context, svc opcua.Service, client *redis.Client, prefix string, logger mflog.Logger) { + eventStore := opcuaredis.NewEventStore(svc, client, prefix, logger) if err := eventStore.Subscribe(ctx, "mainflux.things"); err != nil { logger.Warn(fmt.Sprintf("Failed to subscribe to Redis event source: %s", err)) } } -func newRouteMapRepositoy(client *r.Client, prefix string, logger mflog.Logger) opcua.RouteMapRepository { +func newRouteMapRepositoy(client *redis.Client, prefix string, logger mflog.Logger) opcua.RouteMapRepository { logger.Info(fmt.Sprintf("Connected to %s Redis Route-map", prefix)) - return redis.NewRouteMapRepository(client, prefix) + return opcuaredis.NewRouteMapRepository(client, prefix) } func newService(sub opcua.Subscriber, browser opcua.Browser, thingRM, chanRM, connRM opcua.RouteMapRepository, opcuaConfig opcua.Config, logger mflog.Logger) opcua.Service { diff --git a/cmd/postgres-reader/main.go b/cmd/postgres-reader/main.go index 3f3ded7663..d6421bb933 100644 --- a/cmd/postgres-reader/main.go +++ b/cmd/postgres-reader/main.go @@ -14,9 +14,9 @@ import ( chclient "github.com/mainflux/callhome/pkg/client" "github.com/mainflux/mainflux" "github.com/mainflux/mainflux/internal" - authClient "github.com/mainflux/mainflux/internal/clients/grpc/auth" - thingsClient "github.com/mainflux/mainflux/internal/clients/grpc/things" - pgClient "github.com/mainflux/mainflux/internal/clients/postgres" + authclient "github.com/mainflux/mainflux/internal/clients/grpc/auth" + thingsclient "github.com/mainflux/mainflux/internal/clients/grpc/things" + pgclient "github.com/mainflux/mainflux/internal/clients/postgres" "github.com/mainflux/mainflux/internal/env" "github.com/mainflux/mainflux/internal/server" httpserver "github.com/mainflux/mainflux/internal/server/http" @@ -67,13 +67,13 @@ func main() { } } - dbConfig := pgClient.Config{Name: defDB} + dbConfig := pgclient.Config{Name: defDB} if err := dbConfig.LoadEnv(envPrefixDB); err != nil { logger.Error(err.Error()) exitCode = 1 return } - db, err := pgClient.Connect(dbConfig) + db, err := pgclient.Connect(dbConfig) if err != nil { logger.Error(fmt.Sprintf("failed to setup postgres database : %s", err)) exitCode = 1 @@ -81,7 +81,7 @@ func main() { } defer db.Close() - tc, tcHandler, err := thingsClient.Setup() + tc, tcHandler, err := thingsclient.Setup() if err != nil { logger.Error(err.Error()) exitCode = 1 @@ -91,7 +91,7 @@ func main() { logger.Info("Successfully connected to things grpc server " + tcHandler.Secure()) - auth, authHandler, err := authClient.Setup(svcName) + auth, authHandler, err := authclient.Setup(svcName) if err != nil { logger.Error(err.Error()) exitCode = 1 diff --git a/cmd/postgres-writer/main.go b/cmd/postgres-writer/main.go index 3c79332514..46e6324bc7 100644 --- a/cmd/postgres-writer/main.go +++ b/cmd/postgres-writer/main.go @@ -14,12 +14,12 @@ import ( chclient "github.com/mainflux/callhome/pkg/client" "github.com/mainflux/mainflux" "github.com/mainflux/mainflux/consumers" - consumerTracing "github.com/mainflux/mainflux/consumers/tracing" + consumertracing "github.com/mainflux/mainflux/consumers/tracing" "github.com/mainflux/mainflux/consumers/writers/api" - writerPg "github.com/mainflux/mainflux/consumers/writers/postgres" + writerpg "github.com/mainflux/mainflux/consumers/writers/postgres" "github.com/mainflux/mainflux/internal" - jaegerClient "github.com/mainflux/mainflux/internal/clients/jaeger" - pgClient "github.com/mainflux/mainflux/internal/clients/postgres" + jaegerclient "github.com/mainflux/mainflux/internal/clients/jaeger" + pgclient "github.com/mainflux/mainflux/internal/clients/postgres" "github.com/mainflux/mainflux/internal/env" "github.com/mainflux/mainflux/internal/server" httpserver "github.com/mainflux/mainflux/internal/server/http" @@ -79,14 +79,14 @@ func main() { return } - dbConfig := pgClient.Config{Name: defDB} - db, err := pgClient.SetupWithConfig(envPrefixDB, *writerPg.Migration(), dbConfig) + dbConfig := pgclient.Config{Name: defDB} + db, err := pgclient.SetupWithConfig(envPrefixDB, *writerpg.Migration(), dbConfig) if err != nil { logger.Fatal(err.Error()) } defer db.Close() - tp, err := jaegerClient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) + tp, err := jaegerclient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) if err != nil { logger.Error(fmt.Sprintf("Failed to init Jaeger: %s", err)) exitCode = 1 @@ -109,7 +109,7 @@ func main() { pubSub = brokerstracing.NewPubSub(httpServerConfig, tracer, pubSub) repo := newService(db, logger) - repo = consumerTracing.NewBlocking(tracer, repo, httpServerConfig) + repo = consumertracing.NewBlocking(tracer, repo, httpServerConfig) if err = consumers.Start(ctx, svcName, pubSub, repo, cfg.ConfigPath, logger); err != nil { logger.Error(fmt.Sprintf("failed to create Postgres writer: %s", err)) @@ -138,7 +138,7 @@ func main() { } func newService(db *sqlx.DB, logger mflog.Logger) consumers.BlockingConsumer { - svc := writerPg.New(db) + svc := writerpg.New(db) svc = api.LoggingMiddleware(svc, logger) counter, latency := internal.MakeMetrics("postgres", "message_writer") svc = api.MetricsMiddleware(svc, counter, latency) diff --git a/cmd/provision/main.go b/cmd/provision/main.go index 0e25b7fb97..16f4e25827 100644 --- a/cmd/provision/main.go +++ b/cmd/provision/main.go @@ -21,7 +21,7 @@ import ( mfclients "github.com/mainflux/mainflux/pkg/clients" "github.com/mainflux/mainflux/pkg/errors" mfgroups "github.com/mainflux/mainflux/pkg/groups" - mfSDK "github.com/mainflux/mainflux/pkg/sdk/go" + mfsdk "github.com/mainflux/mainflux/pkg/sdk/go" "github.com/mainflux/mainflux/pkg/uuid" "github.com/mainflux/mainflux/provision" "github.com/mainflux/mainflux/provision/api" @@ -123,7 +123,7 @@ func main() { logger.Info("Continue with settings from file: " + cfg.File) } - SDKCfg := mfSDK.Config{ + SDKCfg := mfsdk.Config{ UsersURL: cfg.Server.UsersURL, ThingsURL: cfg.Server.ThingsURL, BootstrapURL: cfg.Server.MfBSURL, @@ -131,7 +131,7 @@ func main() { MsgContentType: contentType, TLSVerification: cfg.Server.TLS, } - SDK := mfSDK.NewSDK(SDKCfg) + SDK := mfsdk.NewSDK(SDKCfg) svc := provision.New(cfg, SDK, logger) svc = api.NewLoggingMiddleware(svc, logger) @@ -155,7 +155,6 @@ func main() { if err := g.Wait(); err != nil { logger.Error(fmt.Sprintf("Provision service terminated: %s", err)) } - } func loadConfigFromFile(file string) (provision.Config, error) { diff --git a/cmd/smpp-notifier/main.go b/cmd/smpp-notifier/main.go index b1e5a476bf..ec72da4257 100644 --- a/cmd/smpp-notifier/main.go +++ b/cmd/smpp-notifier/main.go @@ -16,13 +16,13 @@ import ( "github.com/mainflux/mainflux/consumers" "github.com/mainflux/mainflux/consumers/notifiers" "github.com/mainflux/mainflux/consumers/notifiers/api" - notifierPg "github.com/mainflux/mainflux/consumers/notifiers/postgres" + notifierpg "github.com/mainflux/mainflux/consumers/notifiers/postgres" mfsmpp "github.com/mainflux/mainflux/consumers/notifiers/smpp" "github.com/mainflux/mainflux/consumers/notifiers/tracing" "github.com/mainflux/mainflux/internal" - authClient "github.com/mainflux/mainflux/internal/clients/grpc/auth" - jaegerClient "github.com/mainflux/mainflux/internal/clients/jaeger" - pgClient "github.com/mainflux/mainflux/internal/clients/postgres" + authclient "github.com/mainflux/mainflux/internal/clients/grpc/auth" + jaegerclient "github.com/mainflux/mainflux/internal/clients/jaeger" + pgclient "github.com/mainflux/mainflux/internal/clients/postgres" "github.com/mainflux/mainflux/internal/env" "github.com/mainflux/mainflux/internal/server" httpserver "github.com/mainflux/mainflux/internal/server/http" @@ -79,8 +79,8 @@ func main() { } } - dbConfig := pgClient.Config{Name: defDB} - db, err := pgClient.SetupWithConfig(envPrefixDB, *notifierPg.Migration(), dbConfig) + dbConfig := pgclient.Config{Name: defDB} + db, err := pgclient.SetupWithConfig(envPrefixDB, *notifierpg.Migration(), dbConfig) if err != nil { logger.Fatal(err.Error()) } @@ -100,7 +100,7 @@ func main() { return } - tp, err := jaegerClient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) + tp, err := jaegerclient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) if err != nil { logger.Error(fmt.Sprintf("Failed to init Jaeger: %s", err)) exitCode = 1 @@ -122,7 +122,7 @@ func main() { defer pubSub.Close() pubSub = brokerstracing.NewPubSub(httpServerConfig, tracer, pubSub) - auth, authHandler, err := authClient.Setup(svcName) + auth, authHandler, err := authclient.Setup(svcName) if err != nil { logger.Error(err.Error()) exitCode = 1 @@ -156,12 +156,11 @@ func main() { if err := g.Wait(); err != nil { logger.Error(fmt.Sprintf("SMPP notifier service terminated: %s", err)) } - } func newService(db *sqlx.DB, tracer trace.Tracer, auth policies.AuthServiceClient, c config, sc mfsmpp.Config, logger mflog.Logger) notifiers.Service { - database := notifierPg.NewDatabase(db, tracer) - repo := tracing.New(tracer, notifierPg.New(database)) + database := notifierpg.NewDatabase(db, tracer) + repo := tracing.New(tracer, notifierpg.New(database)) idp := ulid.New() notifier := mfsmpp.New(sc) svc := notifiers.New(auth, repo, idp, notifier, c.From) diff --git a/cmd/smtp-notifier/main.go b/cmd/smtp-notifier/main.go index 4b9d7d7902..af40a39992 100644 --- a/cmd/smtp-notifier/main.go +++ b/cmd/smtp-notifier/main.go @@ -16,13 +16,13 @@ import ( "github.com/mainflux/mainflux/consumers" "github.com/mainflux/mainflux/consumers/notifiers" "github.com/mainflux/mainflux/consumers/notifiers/api" - notifierPg "github.com/mainflux/mainflux/consumers/notifiers/postgres" + notifierpg "github.com/mainflux/mainflux/consumers/notifiers/postgres" "github.com/mainflux/mainflux/consumers/notifiers/smtp" "github.com/mainflux/mainflux/consumers/notifiers/tracing" "github.com/mainflux/mainflux/internal" - authClient "github.com/mainflux/mainflux/internal/clients/grpc/auth" - jaegerClient "github.com/mainflux/mainflux/internal/clients/jaeger" - pgClient "github.com/mainflux/mainflux/internal/clients/postgres" + authclient "github.com/mainflux/mainflux/internal/clients/grpc/auth" + jaegerclient "github.com/mainflux/mainflux/internal/clients/jaeger" + pgclient "github.com/mainflux/mainflux/internal/clients/postgres" "github.com/mainflux/mainflux/internal/email" "github.com/mainflux/mainflux/internal/env" "github.com/mainflux/mainflux/internal/server" @@ -80,8 +80,8 @@ func main() { } } - dbConfig := pgClient.Config{Name: defDB} - db, err := pgClient.SetupWithConfig(envPrefixDB, *notifierPg.Migration(), dbConfig) + dbConfig := pgclient.Config{Name: defDB} + db, err := pgclient.SetupWithConfig(envPrefixDB, *notifierpg.Migration(), dbConfig) if err != nil { logger.Fatal(err.Error()) exitCode = 1 @@ -103,7 +103,7 @@ func main() { return } - tp, err := jaegerClient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) + tp, err := jaegerclient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) if err != nil { logger.Error(fmt.Sprintf("failed to init Jaeger: %s", err)) exitCode = 1 @@ -125,7 +125,7 @@ func main() { defer pubSub.Close() pubSub = brokerstracing.NewPubSub(httpServerConfig, tracer, pubSub) - auth, authHandler, err := authClient.Setup(svcName) + auth, authHandler, err := authclient.Setup(svcName) if err != nil { logger.Error(err.Error()) exitCode = 1 @@ -166,12 +166,11 @@ func main() { if err := g.Wait(); err != nil { logger.Error(fmt.Sprintf("SMTP notifier service terminated: %s", err)) } - } func newService(db *sqlx.DB, tracer trace.Tracer, auth policies.AuthServiceClient, c config, ec email.Config, logger mflog.Logger) (notifiers.Service, error) { - database := notifierPg.NewDatabase(db, tracer) - repo := tracing.New(tracer, notifierPg.New(database)) + database := notifierpg.NewDatabase(db, tracer) + repo := tracing.New(tracer, notifierpg.New(database)) idp := ulid.New() agent, err := email.New(&ec) diff --git a/cmd/things/main.go b/cmd/things/main.go index d4341b0361..9ce8986b86 100644 --- a/cmd/things/main.go +++ b/cmd/things/main.go @@ -17,10 +17,10 @@ import ( chclient "github.com/mainflux/callhome/pkg/client" "github.com/mainflux/mainflux" "github.com/mainflux/mainflux/internal" - authClient "github.com/mainflux/mainflux/internal/clients/grpc/auth" - jaegerClient "github.com/mainflux/mainflux/internal/clients/jaeger" - pgClient "github.com/mainflux/mainflux/internal/clients/postgres" - redisClient "github.com/mainflux/mainflux/internal/clients/redis" + authclient "github.com/mainflux/mainflux/internal/clients/grpc/auth" + jaegerclient "github.com/mainflux/mainflux/internal/clients/jaeger" + pgclient "github.com/mainflux/mainflux/internal/clients/postgres" + redisclient "github.com/mainflux/mainflux/internal/clients/redis" "github.com/mainflux/mainflux/internal/env" "github.com/mainflux/mainflux/internal/postgres" "github.com/mainflux/mainflux/internal/server" @@ -46,7 +46,7 @@ import ( ppostgres "github.com/mainflux/mainflux/things/policies/postgres" pcache "github.com/mainflux/mainflux/things/policies/redis" ppracing "github.com/mainflux/mainflux/things/policies/tracing" - thingsPg "github.com/mainflux/mainflux/things/postgres" + thingspg "github.com/mainflux/mainflux/things/postgres" upolicies "github.com/mainflux/mainflux/users/policies" "go.opentelemetry.io/otel/trace" "golang.org/x/sync/errgroup" @@ -103,11 +103,11 @@ func main() { } // Create new database for things - dbConfig := pgClient.Config{Name: defDB} + dbConfig := pgclient.Config{Name: defDB} if err := dbConfig.LoadEnv(envPrefixDB); err != nil { logger.Fatal(err.Error()) } - db, err := pgClient.SetupWithConfig(envPrefixDB, *thingsPg.Migration(), dbConfig) + db, err := pgclient.SetupWithConfig(envPrefixDB, *thingspg.Migration(), dbConfig) if err != nil { logger.Error(err.Error()) exitCode = 1 @@ -115,7 +115,7 @@ func main() { } defer db.Close() - tp, err := jaegerClient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) + tp, err := jaegerclient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) if err != nil { logger.Error(fmt.Sprintf("Failed to init Jaeger: %s", err)) exitCode = 1 @@ -129,22 +129,22 @@ func main() { tracer := tp.Tracer(svcName) // Setup new redis cache client - cacheClient, err := redisClient.Setup(envPrefixCache) + cacheclient, err := redisclient.Setup(envPrefixCache) if err != nil { logger.Error(err.Error()) exitCode = 1 return } - defer cacheClient.Close() + defer cacheclient.Close() // Setup new redis event store client - esClient, err := redisClient.Setup(envPrefixES) + esclient, err := redisclient.Setup(envPrefixES) if err != nil { logger.Error(err.Error()) exitCode = 1 return } - defer esClient.Close() + defer esclient.Close() var auth upolicies.AuthServiceClient switch cfg.StandaloneID != "" && cfg.StandaloneToken != "" { @@ -152,7 +152,7 @@ func main() { auth = localusers.NewAuthService(cfg.StandaloneID, cfg.StandaloneToken) logger.Info("Using standalone auth service") default: - authServiceClient, authHandler, err := authClient.Setup(svcName) + authServiceClient, authHandler, err := authclient.Setup(svcName) if err != nil { logger.Error(err.Error()) exitCode = 1 @@ -163,7 +163,7 @@ func main() { logger.Info("Successfully connected to auth grpc server " + authHandler.Secure()) } - csvc, gsvc, psvc := newService(ctx, db, dbConfig, auth, cacheClient, esClient, cfg.CacheKeyDuration, tracer, logger) + csvc, gsvc, psvc := newService(ctx, db, dbConfig, auth, cacheclient, esclient, cfg.CacheKeyDuration, tracer, logger) httpServerConfig := server.Config{Port: defSvcHTTPPort} if err := env.Parse(&httpServerConfig, env.Options{Prefix: envPrefixHTTP}); err != nil { @@ -211,7 +211,7 @@ func main() { } } -func newService(ctx context.Context, db *sqlx.DB, dbConfig pgClient.Config, auth upolicies.AuthServiceClient, cacheClient *redis.Client, esClient *redis.Client, keyDuration string, tracer trace.Tracer, logger mflog.Logger) (clients.Service, groups.Service, tpolicies.Service) { +func newService(ctx context.Context, db *sqlx.DB, dbConfig pgclient.Config, auth upolicies.AuthServiceClient, cacheClient *redis.Client, esClient *redis.Client, keyDuration string, tracer trace.Tracer, logger mflog.Logger) (clients.Service, groups.Service, tpolicies.Service) { database := postgres.NewDatabase(db, dbConfig, tracer) cRepo := cpostgres.NewRepository(database) gRepo := gpostgres.New(database) diff --git a/cmd/timescale-reader/main.go b/cmd/timescale-reader/main.go index 43691385f4..500ca2b425 100644 --- a/cmd/timescale-reader/main.go +++ b/cmd/timescale-reader/main.go @@ -14,9 +14,9 @@ import ( chclient "github.com/mainflux/callhome/pkg/client" "github.com/mainflux/mainflux" "github.com/mainflux/mainflux/internal" - authClient "github.com/mainflux/mainflux/internal/clients/grpc/auth" - thingsClient "github.com/mainflux/mainflux/internal/clients/grpc/things" - pgClient "github.com/mainflux/mainflux/internal/clients/postgres" + authclient "github.com/mainflux/mainflux/internal/clients/grpc/auth" + thingsclient "github.com/mainflux/mainflux/internal/clients/grpc/things" + pgclient "github.com/mainflux/mainflux/internal/clients/postgres" "github.com/mainflux/mainflux/internal/env" "github.com/mainflux/mainflux/internal/server" httpserver "github.com/mainflux/mainflux/internal/server/http" @@ -67,13 +67,13 @@ func main() { } } - dbConfig := pgClient.Config{Name: defDB} + dbConfig := pgclient.Config{Name: defDB} if err := dbConfig.LoadEnv(envPrefixDB); err != nil { logger.Error(err.Error()) exitCode = 1 return } - db, err := pgClient.Connect(dbConfig) + db, err := pgclient.Connect(dbConfig) if err != nil { logger.Error(err.Error()) } @@ -81,7 +81,7 @@ func main() { repo := newService(db, logger) - auth, authHandler, err := authClient.Setup(svcName) + auth, authHandler, err := authclient.Setup(svcName) if err != nil { logger.Error(err.Error()) exitCode = 1 @@ -91,7 +91,7 @@ func main() { logger.Info("Successfully connected to auth grpc server " + authHandler.Secure()) - tc, tcHandler, err := thingsClient.Setup() + tc, tcHandler, err := thingsclient.Setup() if err != nil { logger.Error(err.Error()) exitCode = 1 diff --git a/cmd/timescale-writer/main.go b/cmd/timescale-writer/main.go index bcf6ce1a2f..8bbd4831ab 100644 --- a/cmd/timescale-writer/main.go +++ b/cmd/timescale-writer/main.go @@ -14,12 +14,12 @@ import ( chclient "github.com/mainflux/callhome/pkg/client" "github.com/mainflux/mainflux" "github.com/mainflux/mainflux/consumers" - consumerTracing "github.com/mainflux/mainflux/consumers/tracing" + consumertracing "github.com/mainflux/mainflux/consumers/tracing" "github.com/mainflux/mainflux/consumers/writers/api" "github.com/mainflux/mainflux/consumers/writers/timescale" "github.com/mainflux/mainflux/internal" - jaegerClient "github.com/mainflux/mainflux/internal/clients/jaeger" - pgClient "github.com/mainflux/mainflux/internal/clients/postgres" + jaegerclient "github.com/mainflux/mainflux/internal/clients/jaeger" + pgclient "github.com/mainflux/mainflux/internal/clients/postgres" "github.com/mainflux/mainflux/internal/env" "github.com/mainflux/mainflux/internal/server" httpserver "github.com/mainflux/mainflux/internal/server/http" @@ -79,8 +79,8 @@ func main() { return } - dbConfig := pgClient.Config{Name: defDB} - db, err := pgClient.SetupWithConfig(envPrefixDB, *timescale.Migration(), dbConfig) + dbConfig := pgclient.Config{Name: defDB} + db, err := pgclient.SetupWithConfig(envPrefixDB, *timescale.Migration(), dbConfig) if err != nil { logger.Error(err.Error()) exitCode = 1 @@ -88,7 +88,7 @@ func main() { } defer db.Close() - tp, err := jaegerClient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) + tp, err := jaegerclient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) if err != nil { logger.Error(fmt.Sprintf("Failed to init Jaeger: %s", err)) exitCode = 1 @@ -102,7 +102,7 @@ func main() { tracer := tp.Tracer(svcName) repo := newService(db, logger) - repo = consumerTracing.NewBlocking(tracer, repo, httpServerConfig) + repo = consumertracing.NewBlocking(tracer, repo, httpServerConfig) pubSub, err := brokers.NewPubSub(cfg.BrokerURL, "", logger) if err != nil { diff --git a/cmd/twins/main.go b/cmd/twins/main.go index 7c8ce3805e..c55cd5acbc 100644 --- a/cmd/twins/main.go +++ b/cmd/twins/main.go @@ -14,10 +14,10 @@ import ( chclient "github.com/mainflux/callhome/pkg/client" "github.com/mainflux/mainflux" "github.com/mainflux/mainflux/internal" - authClient "github.com/mainflux/mainflux/internal/clients/grpc/auth" - jaegerClient "github.com/mainflux/mainflux/internal/clients/jaeger" - mongoClient "github.com/mainflux/mainflux/internal/clients/mongo" - redisClient "github.com/mainflux/mainflux/internal/clients/redis" + authclient "github.com/mainflux/mainflux/internal/clients/grpc/auth" + jaegerclient "github.com/mainflux/mainflux/internal/clients/jaeger" + mongoclient "github.com/mainflux/mainflux/internal/clients/mongo" + redisclient "github.com/mainflux/mainflux/internal/clients/redis" "github.com/mainflux/mainflux/internal/env" "github.com/mainflux/mainflux/internal/server" httpserver "github.com/mainflux/mainflux/internal/server/http" @@ -92,7 +92,7 @@ func main() { return } - cacheClient, err := redisClient.Setup(envPrefixCache) + cacheClient, err := redisclient.Setup(envPrefixCache) if err != nil { logger.Error(err.Error()) exitCode = 1 @@ -101,7 +101,7 @@ func main() { defer cacheClient.Close() // Setup new redis event store client - esClient, err := redisClient.Setup(envPrefixES) + esClient, err := redisclient.Setup(envPrefixES) if err != nil { logger.Error(err.Error()) exitCode = 1 @@ -109,14 +109,14 @@ func main() { } defer esClient.Close() - db, err := mongoClient.Setup(envPrefixDB) + db, err := mongoclient.Setup(envPrefixDB) if err != nil { logger.Error(fmt.Sprintf("failed to setup postgres database : %s", err)) exitCode = 1 return } - tp, err := jaegerClient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) + tp, err := jaegerclient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) if err != nil { logger.Error(fmt.Sprintf("failed to init Jaeger: %s", err)) exitCode = 1 @@ -134,7 +134,7 @@ func main() { case true: auth = localusers.NewAuthService(cfg.StandaloneID, cfg.StandaloneToken) default: - authServiceClient, authHandler, err := authClient.Setup(svcName) + authServiceClient, authHandler, err := authclient.Setup(svcName) if err != nil { logger.Error(err.Error()) exitCode = 1 @@ -176,7 +176,7 @@ func main() { } } -func newService(ctx context.Context, id string, ps messaging.PubSub, chanID string, users policies.AuthServiceClient, tracer trace.Tracer, db *mongo.Database, cacheClient *redis.Client, esClient *redis.Client, logger mflog.Logger) twins.Service { +func newService(ctx context.Context, id string, ps messaging.PubSub, chanID string, users policies.AuthServiceClient, tracer trace.Tracer, db *mongo.Database, cacheclient *redis.Client, esClient *redis.Client, logger mflog.Logger) twins.Service { twinRepo := twmongodb.NewTwinRepository(db) twinRepo = tracing.TwinRepositoryMiddleware(tracer, twinRepo) @@ -184,7 +184,7 @@ func newService(ctx context.Context, id string, ps messaging.PubSub, chanID stri stateRepo = tracing.StateRepositoryMiddleware(tracer, stateRepo) idProvider := uuid.New() - twinCache := rediscache.NewTwinCache(cacheClient) + twinCache := rediscache.NewTwinCache(cacheclient) twinCache = tracing.TwinCacheMiddleware(tracer, twinCache) svc := twins.New(ps, users, twinRepo, twinCache, stateRepo, idProvider, chanID, logger) diff --git a/cmd/users/main.go b/cmd/users/main.go index 34e17ca7d1..2adab6ad5e 100644 --- a/cmd/users/main.go +++ b/cmd/users/main.go @@ -18,9 +18,9 @@ import ( chclient "github.com/mainflux/callhome/pkg/client" "github.com/mainflux/mainflux" "github.com/mainflux/mainflux/internal" - jaegerClient "github.com/mainflux/mainflux/internal/clients/jaeger" - pgClient "github.com/mainflux/mainflux/internal/clients/postgres" - redisClient "github.com/mainflux/mainflux/internal/clients/redis" + jaegerclient "github.com/mainflux/mainflux/internal/clients/jaeger" + pgclient "github.com/mainflux/mainflux/internal/clients/postgres" + redisclient "github.com/mainflux/mainflux/internal/clients/redis" "github.com/mainflux/mainflux/internal/email" "github.com/mainflux/mainflux/internal/env" "github.com/mainflux/mainflux/internal/postgres" @@ -50,7 +50,7 @@ import ( ppostgres "github.com/mainflux/mainflux/users/policies/postgres" pcache "github.com/mainflux/mainflux/users/policies/redis" ptracing "github.com/mainflux/mainflux/users/policies/tracing" - clientsPg "github.com/mainflux/mainflux/users/postgres" + clientspg "github.com/mainflux/mainflux/users/postgres" "go.opentelemetry.io/otel/trace" "golang.org/x/sync/errgroup" "google.golang.org/grpc" @@ -120,11 +120,11 @@ func main() { return } - dbConfig := pgClient.Config{Name: defDB} + dbConfig := pgclient.Config{Name: defDB} if err := dbConfig.LoadEnv(envPrefixDB); err != nil { logger.Fatal(err.Error()) } - db, err := pgClient.SetupWithConfig(envPrefixDB, *clientsPg.Migration(), dbConfig) + db, err := pgclient.SetupWithConfig(envPrefixDB, *clientspg.Migration(), dbConfig) if err != nil { logger.Error(err.Error()) exitCode = 1 @@ -132,7 +132,7 @@ func main() { } defer db.Close() - tp, err := jaegerClient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) + tp, err := jaegerclient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) if err != nil { logger.Error(fmt.Sprintf("failed to init Jaeger: %s", err)) exitCode = 1 @@ -146,7 +146,7 @@ func main() { tracer := tp.Tracer(svcName) // Setup new redis event store client - esClient, err := redisClient.Setup(envPrefixES) + esClient, err := redisclient.Setup(envPrefixES) if err != nil { logger.Fatal(err.Error()) } @@ -198,7 +198,7 @@ func main() { } } -func newService(ctx context.Context, db *sqlx.DB, dbConfig pgClient.Config, esClient *redis.Client, tracer trace.Tracer, c config, ec email.Config, logger mflog.Logger) (clients.Service, groups.Service, policies.Service) { +func newService(ctx context.Context, db *sqlx.DB, dbConfig pgclient.Config, esClient *redis.Client, tracer trace.Tracer, c config, ec email.Config, logger mflog.Logger) (clients.Service, groups.Service, policies.Service) { database := postgres.NewDatabase(db, dbConfig, tracer) cRepo := uclients.NewRepository(database) gRepo := gpostgres.New(database) diff --git a/cmd/ws/main.go b/cmd/ws/main.go index 7a2e957503..19f6a0fb05 100644 --- a/cmd/ws/main.go +++ b/cmd/ws/main.go @@ -13,8 +13,8 @@ import ( chclient "github.com/mainflux/callhome/pkg/client" "github.com/mainflux/mainflux" "github.com/mainflux/mainflux/internal" - thingsClient "github.com/mainflux/mainflux/internal/clients/grpc/things" - jaegerClient "github.com/mainflux/mainflux/internal/clients/jaeger" + thingsclient "github.com/mainflux/mainflux/internal/clients/grpc/things" + jaegerclient "github.com/mainflux/mainflux/internal/clients/jaeger" "github.com/mainflux/mainflux/internal/env" "github.com/mainflux/mainflux/internal/server" httpserver "github.com/mainflux/mainflux/internal/server/http" @@ -77,7 +77,7 @@ func main() { return } - tc, tcHandler, err := thingsClient.Setup() + tc, tcHandler, err := thingsclient.Setup() if err != nil { logger.Error(err.Error()) exitCode = 1 @@ -87,7 +87,7 @@ func main() { logger.Info("Successfully connected to things grpc server " + tcHandler.Secure()) - tp, err := jaegerClient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) + tp, err := jaegerclient.NewProvider(svcName, cfg.JaegerURL, cfg.InstanceID) if err != nil { logger.Error(fmt.Sprintf("failed to init Jaeger: %s", err)) exitCode = 1 diff --git a/coap/adapter.go b/coap/adapter.go index bb54cdeb09..c5cb2f1509 100644 --- a/coap/adapter.go +++ b/coap/adapter.go @@ -12,9 +12,8 @@ import ( "sync" "github.com/mainflux/mainflux/pkg/errors" - "github.com/mainflux/mainflux/things/policies" - "github.com/mainflux/mainflux/pkg/messaging" + "github.com/mainflux/mainflux/things/policies" ) const chansPrefix = "channels" diff --git a/coap/api/logging.go b/coap/api/logging.go index a3033adb69..c11ca7054c 100644 --- a/coap/api/logging.go +++ b/coap/api/logging.go @@ -82,5 +82,4 @@ func (lm *loggingMiddleware) Unsubscribe(ctx context.Context, key, chanID, subto }(time.Now()) return lm.svc.Unsubscribe(ctx, key, chanID, subtopic, token) - } diff --git a/coap/api/transport.go b/coap/api/transport.go index 6ee4451b61..323cd58087 100644 --- a/coap/api/transport.go +++ b/coap/api/transport.go @@ -13,12 +13,11 @@ import ( "strings" "time" - "github.com/mainflux/mainflux/pkg/errors" - "github.com/go-zoo/bone" "github.com/mainflux/mainflux" "github.com/mainflux/mainflux/coap" mflog "github.com/mainflux/mainflux/logger" + "github.com/mainflux/mainflux/pkg/errors" "github.com/mainflux/mainflux/pkg/messaging" "github.com/plgd-dev/go-coap/v2/message" "github.com/plgd-dev/go-coap/v2/message/codes" diff --git a/consumers/messages.go b/consumers/messages.go index 01163b2adb..59788f10da 100644 --- a/consumers/messages.go +++ b/consumers/messages.go @@ -9,8 +9,6 @@ import ( "os" "strings" - "github.com/pelletier/go-toml" - "github.com/mainflux/mainflux/internal/apiutil" "github.com/mainflux/mainflux/logger" "github.com/mainflux/mainflux/pkg/errors" @@ -19,6 +17,7 @@ import ( "github.com/mainflux/mainflux/pkg/transformers" "github.com/mainflux/mainflux/pkg/transformers/json" "github.com/mainflux/mainflux/pkg/transformers/senml" + "github.com/pelletier/go-toml" ) const ( @@ -55,7 +54,6 @@ func Start(ctx context.Context, id string, sub messaging.Subscriber, consumer in default: return apiutil.ErrInvalidQueryParams } - } return nil } diff --git a/consumers/notifiers/api/endpoint_test.go b/consumers/notifiers/api/endpoint_test.go index 146010688b..918d22e697 100644 --- a/consumers/notifiers/api/endpoint_test.go +++ b/consumers/notifiers/api/endpoint_test.go @@ -13,7 +13,7 @@ import ( "strings" "testing" - notifiers "github.com/mainflux/mainflux/consumers/notifiers" + "github.com/mainflux/mainflux/consumers/notifiers" httpapi "github.com/mainflux/mainflux/consumers/notifiers/api" "github.com/mainflux/mainflux/consumers/notifiers/mocks" "github.com/mainflux/mainflux/internal/apiutil" diff --git a/consumers/notifiers/api/logging.go b/consumers/notifiers/api/logging.go index e1acdd921b..e066f2e37b 100644 --- a/consumers/notifiers/api/logging.go +++ b/consumers/notifiers/api/logging.go @@ -10,7 +10,7 @@ import ( "fmt" "time" - notifiers "github.com/mainflux/mainflux/consumers/notifiers" + "github.com/mainflux/mainflux/consumers/notifiers" mflog "github.com/mainflux/mainflux/logger" ) diff --git a/consumers/notifiers/api/metrics.go b/consumers/notifiers/api/metrics.go index f187d92510..5f3923c796 100644 --- a/consumers/notifiers/api/metrics.go +++ b/consumers/notifiers/api/metrics.go @@ -10,7 +10,7 @@ import ( "time" "github.com/go-kit/kit/metrics" - notifiers "github.com/mainflux/mainflux/consumers/notifiers" + "github.com/mainflux/mainflux/consumers/notifiers" ) var _ notifiers.Service = (*metricsMiddleware)(nil) diff --git a/consumers/notifiers/api/responses.go b/consumers/notifiers/api/responses.go index 385709f324..ff973421a3 100644 --- a/consumers/notifiers/api/responses.go +++ b/consumers/notifiers/api/responses.go @@ -73,8 +73,7 @@ func (res listSubsRes) Empty() bool { return false } -type removeSubRes struct { -} +type removeSubRes struct{} func (res removeSubRes) Code() int { return http.StatusNoContent diff --git a/consumers/notifiers/api/transport.go b/consumers/notifiers/api/transport.go index 2577cf3eed..6aee5ce257 100644 --- a/consumers/notifiers/api/transport.go +++ b/consumers/notifiers/api/transport.go @@ -13,7 +13,7 @@ import ( kithttp "github.com/go-kit/kit/transport/http" "github.com/go-zoo/bone" "github.com/mainflux/mainflux" - notifiers "github.com/mainflux/mainflux/consumers/notifiers" + "github.com/mainflux/mainflux/consumers/notifiers" "github.com/mainflux/mainflux/internal/apiutil" "github.com/mainflux/mainflux/logger" "github.com/mainflux/mainflux/pkg/errors" diff --git a/consumers/notifiers/mocks/notifier.go b/consumers/notifiers/mocks/notifier.go index 69f01829a5..d725b76cac 100644 --- a/consumers/notifiers/mocks/notifier.go +++ b/consumers/notifiers/mocks/notifier.go @@ -4,7 +4,7 @@ package mocks import ( - notifiers "github.com/mainflux/mainflux/consumers/notifiers" + "github.com/mainflux/mainflux/consumers/notifiers" "github.com/mainflux/mainflux/pkg/messaging" ) diff --git a/consumers/notifiers/mocks/subscriptions.go b/consumers/notifiers/mocks/subscriptions.go index ac0764edc9..5baef78396 100644 --- a/consumers/notifiers/mocks/subscriptions.go +++ b/consumers/notifiers/mocks/subscriptions.go @@ -8,7 +8,7 @@ import ( "sort" "sync" - notifiers "github.com/mainflux/mainflux/consumers/notifiers" + "github.com/mainflux/mainflux/consumers/notifiers" "github.com/mainflux/mainflux/pkg/errors" ) diff --git a/consumers/notifiers/postgres/setup_test.go b/consumers/notifiers/postgres/setup_test.go index fa94d02008..ee32bd4813 100644 --- a/consumers/notifiers/postgres/setup_test.go +++ b/consumers/notifiers/postgres/setup_test.go @@ -14,9 +14,9 @@ import ( _ "github.com/jackc/pgx/v5/stdlib" // required for SQL access "github.com/jmoiron/sqlx" "github.com/mainflux/mainflux/consumers/notifiers/postgres" - pgClient "github.com/mainflux/mainflux/internal/clients/postgres" + pgclient "github.com/mainflux/mainflux/internal/clients/postgres" "github.com/mainflux/mainflux/pkg/ulid" - dockertest "github.com/ory/dockertest/v3" + "github.com/ory/dockertest/v3" ) var ( @@ -53,7 +53,7 @@ func TestMain(m *testing.M) { log.Fatalf("Could not connect to docker: %s", err) } - dbConfig := pgClient.Config{ + dbConfig := pgclient.Config{ Host: "localhost", Port: port, User: "test", @@ -65,7 +65,7 @@ func TestMain(m *testing.M) { SSLRootCert: "", } - if db, err = pgClient.SetupDB(dbConfig, *postgres.Migration()); err != nil { + if db, err = pgclient.SetupDB(dbConfig, *postgres.Migration()); err != nil { log.Fatalf("Could not setup test DB connection: %s", err) } diff --git a/consumers/notifiers/postgres/subscriptions.go b/consumers/notifiers/postgres/subscriptions.go index e6325da4a0..e498746cab 100644 --- a/consumers/notifiers/postgres/subscriptions.go +++ b/consumers/notifiers/postgres/subscriptions.go @@ -11,7 +11,7 @@ import ( "github.com/jackc/pgerrcode" "github.com/jackc/pgx/v5/pgconn" - notifiers "github.com/mainflux/mainflux/consumers/notifiers" + "github.com/mainflux/mainflux/consumers/notifiers" "github.com/mainflux/mainflux/pkg/errors" ) diff --git a/consumers/notifiers/postgres/subscriptions_test.go b/consumers/notifiers/postgres/subscriptions_test.go index 4e4eb7af38..16c8c8f19d 100644 --- a/consumers/notifiers/postgres/subscriptions_test.go +++ b/consumers/notifiers/postgres/subscriptions_test.go @@ -8,7 +8,7 @@ import ( "fmt" "testing" - notifiers "github.com/mainflux/mainflux/consumers/notifiers" + "github.com/mainflux/mainflux/consumers/notifiers" "github.com/mainflux/mainflux/consumers/notifiers/postgres" "github.com/mainflux/mainflux/pkg/errors" "github.com/stretchr/testify/assert" diff --git a/consumers/notifiers/service.go b/consumers/notifiers/service.go index b2bcafc47e..e979fd190e 100644 --- a/consumers/notifiers/service.go +++ b/consumers/notifiers/service.go @@ -14,10 +14,8 @@ import ( "github.com/mainflux/mainflux/users/policies" ) -var ( - // ErrMessage indicates an error converting a message to Mainflux message. - ErrMessage = errors.New("failed to convert to Mainflux message") -) +// ErrMessage indicates an error converting a message to Mainflux message. +var ErrMessage = errors.New("failed to convert to Mainflux message") var _ consumers.AsyncConsumer = (*notifierService)(nil) diff --git a/consumers/notifiers/service_test.go b/consumers/notifiers/service_test.go index dad2de526c..52cf29f4dc 100644 --- a/consumers/notifiers/service_test.go +++ b/consumers/notifiers/service_test.go @@ -8,7 +8,7 @@ import ( "fmt" "testing" - notifiers "github.com/mainflux/mainflux/consumers/notifiers" + "github.com/mainflux/mainflux/consumers/notifiers" "github.com/mainflux/mainflux/consumers/notifiers/mocks" "github.com/mainflux/mainflux/pkg/errors" "github.com/mainflux/mainflux/pkg/messaging" diff --git a/consumers/notifiers/smtp/notifier.go b/consumers/notifiers/smtp/notifier.go index ebf27bcee9..e4eddc9ea4 100644 --- a/consumers/notifiers/smtp/notifier.go +++ b/consumers/notifiers/smtp/notifier.go @@ -6,7 +6,7 @@ package smtp import ( "fmt" - notifiers "github.com/mainflux/mainflux/consumers/notifiers" + "github.com/mainflux/mainflux/consumers/notifiers" "github.com/mainflux/mainflux/internal/email" "github.com/mainflux/mainflux/pkg/messaging" ) diff --git a/consumers/notifiers/tracing/subscriptions.go b/consumers/notifiers/tracing/subscriptions.go index 8cd2ab4ed3..ee012f92d1 100644 --- a/consumers/notifiers/tracing/subscriptions.go +++ b/consumers/notifiers/tracing/subscriptions.go @@ -8,7 +8,7 @@ package tracing import ( "context" - notifiers "github.com/mainflux/mainflux/consumers/notifiers" + "github.com/mainflux/mainflux/consumers/notifiers" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" ) diff --git a/consumers/tracing/consumers.go b/consumers/tracing/consumers.go index bc3adfb71b..2bc2a1447b 100644 --- a/consumers/tracing/consumers.go +++ b/consumers/tracing/consumers.go @@ -28,8 +28,10 @@ var defaultAttributes = []attribute.KeyValue{ attribute.String("network.type", "ipv4"), } -var _ consumers.AsyncConsumer = (*tracingMiddlewareAsync)(nil) -var _ consumers.BlockingConsumer = (*tracingMiddlewareBlock)(nil) +var ( + _ consumers.AsyncConsumer = (*tracingMiddlewareAsync)(nil) + _ consumers.BlockingConsumer = (*tracingMiddlewareBlock)(nil) +) type tracingMiddlewareAsync struct { consumer consumers.AsyncConsumer @@ -106,7 +108,7 @@ func (tm *tracingMiddlewareAsync) Errors() <-chan error { } func createSpan(ctx context.Context, operation, clientID, topic, subTopic string, noMessages int, cfg server.Config, spanKind trace.SpanKind, tracer trace.Tracer) (context.Context, trace.Span) { - var subject = fmt.Sprintf("channels.%s.messages", topic) + subject := fmt.Sprintf("channels.%s.messages", topic) if subTopic != "" { subject = fmt.Sprintf("%s.%s", subject, subTopic) } diff --git a/consumers/writers/cassandra/consumer_test.go b/consumers/writers/cassandra/consumer_test.go index 9109ce7238..ff1f97ea0e 100644 --- a/consumers/writers/cassandra/consumer_test.go +++ b/consumers/writers/cassandra/consumer_test.go @@ -11,7 +11,7 @@ import ( "github.com/gofrs/uuid" "github.com/mainflux/mainflux/consumers/writers/cassandra" - casClient "github.com/mainflux/mainflux/internal/clients/cassandra" + casclient "github.com/mainflux/mainflux/internal/clients/cassandra" "github.com/mainflux/mainflux/pkg/transformers/json" "github.com/mainflux/mainflux/pkg/transformers/senml" "github.com/stretchr/testify/assert" @@ -36,12 +36,12 @@ var ( ) func TestSaveSenml(t *testing.T) { - session, err := casClient.Connect(casClient.Config{ + session, err := casclient.Connect(casclient.Config{ Hosts: []string{addr}, Keyspace: keyspace, }) require.Nil(t, err, fmt.Sprintf("failed to connect to Cassandra: %s", err)) - err = casClient.InitDB(session, cassandra.Table) + err = casclient.InitDB(session, cassandra.Table) require.Nil(t, err, fmt.Sprintf("failed to initialize to Cassandra: %s", err)) repo := cassandra.New(session) now := time.Now().Unix() @@ -78,7 +78,7 @@ func TestSaveSenml(t *testing.T) { } func TestSaveJSON(t *testing.T) { - session, err := casClient.Connect(casClient.Config{ + session, err := casclient.Connect(casclient.Config{ Hosts: []string{addr}, Keyspace: keyspace, }) diff --git a/consumers/writers/cassandra/setup_test.go b/consumers/writers/cassandra/setup_test.go index c5c60cfdc8..31f7c3057b 100644 --- a/consumers/writers/cassandra/setup_test.go +++ b/consumers/writers/cassandra/setup_test.go @@ -9,9 +9,9 @@ import ( "testing" "github.com/gocql/gocql" - casClient "github.com/mainflux/mainflux/internal/clients/cassandra" + "github.com/mainflux/mainflux/internal/clients/cassandra" mflog "github.com/mainflux/mainflux/logger" - dockertest "github.com/ory/dockertest/v3" + "github.com/ory/dockertest/v3" ) var logger, _ = mflog.New(os.Stdout, mflog.Info.String()) @@ -35,7 +35,7 @@ func TestMain(m *testing.M) { return err } - session, err := casClient.Connect(casClient.Config{ + session, err := cassandra.Connect(cassandra.Config{ Hosts: []string{addr}, Keyspace: keyspace, }) diff --git a/consumers/writers/influxdb/consumer.go b/consumers/writers/influxdb/consumer.go index f4ec040bfd..5bd0762ea2 100644 --- a/consumers/writers/influxdb/consumer.go +++ b/consumers/writers/influxdb/consumer.go @@ -8,22 +8,23 @@ import ( "math" "time" + 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" "github.com/mainflux/mainflux/consumers" "github.com/mainflux/mainflux/pkg/errors" "github.com/mainflux/mainflux/pkg/transformers/json" "github.com/mainflux/mainflux/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" ) const senmlPoints = "messages" var errSaveMessage = errors.New("failed to save message to influxdb database") -var _ consumers.AsyncConsumer = (*influxRepo)(nil) -var _ consumers.BlockingConsumer = (*influxRepo)(nil) +var ( + _ consumers.AsyncConsumer = (*influxRepo)(nil) + _ consumers.BlockingConsumer = (*influxRepo)(nil) +) type RepoConfig struct { Bucket string diff --git a/consumers/writers/influxdb/consumer_test.go b/consumers/writers/influxdb/consumer_test.go index ec6eb155d2..78731a9584 100644 --- a/consumers/writers/influxdb/consumer_test.go +++ b/consumers/writers/influxdb/consumer_test.go @@ -10,11 +10,10 @@ import ( "testing" "time" - "github.com/mainflux/mainflux/pkg/errors" - influxdata "github.com/influxdata/influxdb-client-go/v2" writer "github.com/mainflux/mainflux/consumers/writers/influxdb" mflog "github.com/mainflux/mainflux/logger" + "github.com/mainflux/mainflux/pkg/errors" "github.com/mainflux/mainflux/pkg/transformers/json" "github.com/mainflux/mainflux/pkg/transformers/senml" "github.com/mainflux/mainflux/pkg/uuid" @@ -70,6 +69,7 @@ func deleteBucket() error { return nil } + func createBucket() error { orgAPI := client.OrganizationsAPI() org, err := orgAPI.FindOrganizationByName(context.Background(), repoCfg.Org) @@ -83,6 +83,7 @@ func createBucket() error { return nil } + func resetBucket() error { if err := deleteBucket(); err != nil { return err diff --git a/consumers/writers/influxdb/setup_test.go b/consumers/writers/influxdb/setup_test.go index 58b0e51e1f..8b5ea9425b 100644 --- a/consumers/writers/influxdb/setup_test.go +++ b/consumers/writers/influxdb/setup_test.go @@ -14,7 +14,7 @@ import ( "time" influxdata "github.com/influxdata/influxdb-client-go/v2" - dockertest "github.com/ory/dockertest/v3" + "github.com/ory/dockertest/v3" ) const ( diff --git a/consumers/writers/mongodb/consumer.go b/consumers/writers/mongodb/consumer.go index f9e5a0c1cb..814083381d 100644 --- a/consumers/writers/mongodb/consumer.go +++ b/consumers/writers/mongodb/consumer.go @@ -6,12 +6,11 @@ package mongodb import ( "context" - "go.mongodb.org/mongo-driver/mongo" - "github.com/mainflux/mainflux/consumers" "github.com/mainflux/mainflux/pkg/errors" "github.com/mainflux/mainflux/pkg/transformers/json" "github.com/mainflux/mainflux/pkg/transformers/senml" + "go.mongodb.org/mongo-driver/mongo" ) const senmlCollection string = "messages" diff --git a/consumers/writers/mongodb/consumer_test.go b/consumers/writers/mongodb/consumer_test.go index 2aa427e3bd..5283ab1a65 100644 --- a/consumers/writers/mongodb/consumer_test.go +++ b/consumers/writers/mongodb/consumer_test.go @@ -11,14 +11,12 @@ import ( "time" "github.com/gofrs/uuid" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "github.com/mainflux/mainflux/consumers/writers/mongodb" + mflog "github.com/mainflux/mainflux/logger" "github.com/mainflux/mainflux/pkg/transformers/json" "github.com/mainflux/mainflux/pkg/transformers/senml" - - mflog "github.com/mainflux/mainflux/logger" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" diff --git a/consumers/writers/mongodb/setup_test.go b/consumers/writers/mongodb/setup_test.go index d08d818c2a..9d77ff66ea 100644 --- a/consumers/writers/mongodb/setup_test.go +++ b/consumers/writers/mongodb/setup_test.go @@ -9,10 +9,9 @@ import ( "os" "testing" + "github.com/ory/dockertest/v3" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" - - dockertest "github.com/ory/dockertest/v3" ) func TestMain(m *testing.M) { diff --git a/consumers/writers/postgres/consumer_test.go b/consumers/writers/postgres/consumer_test.go index 5350522cec..d16fb0679b 100644 --- a/consumers/writers/postgres/consumer_test.go +++ b/consumers/writers/postgres/consumer_test.go @@ -9,12 +9,11 @@ import ( "testing" "time" + "github.com/gofrs/uuid" "github.com/mainflux/mainflux/consumers/writers/postgres" "github.com/mainflux/mainflux/pkg/transformers/json" "github.com/mainflux/mainflux/pkg/transformers/senml" "github.com/stretchr/testify/assert" - - "github.com/gofrs/uuid" ) const ( diff --git a/consumers/writers/postgres/setup_test.go b/consumers/writers/postgres/setup_test.go index a70462fa46..cc8604a379 100644 --- a/consumers/writers/postgres/setup_test.go +++ b/consumers/writers/postgres/setup_test.go @@ -14,7 +14,7 @@ import ( "github.com/jmoiron/sqlx" "github.com/mainflux/mainflux/consumers/writers/postgres" pgclient "github.com/mainflux/mainflux/internal/clients/postgres" - dockertest "github.com/ory/dockertest/v3" + "github.com/ory/dockertest/v3" ) var db *sqlx.DB diff --git a/consumers/writers/timescale/consumer_test.go b/consumers/writers/timescale/consumer_test.go index 11c6cde4a1..b0fa17d4f5 100644 --- a/consumers/writers/timescale/consumer_test.go +++ b/consumers/writers/timescale/consumer_test.go @@ -9,12 +9,11 @@ import ( "testing" "time" + "github.com/gofrs/uuid" "github.com/mainflux/mainflux/consumers/writers/timescale" "github.com/mainflux/mainflux/pkg/transformers/json" "github.com/mainflux/mainflux/pkg/transformers/senml" "github.com/stretchr/testify/assert" - - "github.com/gofrs/uuid" ) const ( diff --git a/consumers/writers/timescale/setup_test.go b/consumers/writers/timescale/setup_test.go index c7c4f01fb3..ed5c48f22c 100644 --- a/consumers/writers/timescale/setup_test.go +++ b/consumers/writers/timescale/setup_test.go @@ -12,10 +12,9 @@ import ( "testing" "github.com/jmoiron/sqlx" - "github.com/mainflux/mainflux/consumers/writers/timescale" - pgClient "github.com/mainflux/mainflux/internal/clients/postgres" - dockertest "github.com/ory/dockertest/v3" + pgclient "github.com/mainflux/mainflux/internal/clients/postgres" + "github.com/ory/dockertest/v3" ) var db *sqlx.DB @@ -49,7 +48,7 @@ func TestMain(m *testing.M) { log.Fatalf("Could not connect to docker: %s", err) } - dbConfig := pgClient.Config{ + dbConfig := pgclient.Config{ Host: "localhost", Port: port, User: "test", @@ -61,7 +60,7 @@ func TestMain(m *testing.M) { SSLRootCert: "", } - db, err = pgClient.SetupDB(dbConfig, *timescale.Migration()) + db, err = pgclient.SetupDB(dbConfig, *timescale.Migration()) if err != nil { log.Fatalf("Could not setup test DB connection: %s", err) } diff --git a/http/api/endpoint_test.go b/http/api/endpoint_test.go index 07bc2ddf16..0dfc3b9c47 100644 --- a/http/api/endpoint_test.go +++ b/http/api/endpoint_test.go @@ -11,7 +11,7 @@ import ( "strings" "testing" - adapter "github.com/mainflux/mainflux/http" + server "github.com/mainflux/mainflux/http" "github.com/mainflux/mainflux/http/api" "github.com/mainflux/mainflux/http/mocks" "github.com/mainflux/mainflux/internal/apiutil" @@ -21,12 +21,12 @@ import ( const instanceID = "5de9b29a-feb9-11ed-be56-0242ac120002" -func newService(cc policies.AuthServiceClient) adapter.Service { +func newService(cc policies.AuthServiceClient) server.Service { pub := mocks.NewPublisher() - return adapter.New(pub, cc) + return server.New(pub, cc) } -func newHTTPServer(svc adapter.Service) *httptest.Server { +func newHTTPServer(svc server.Service) *httptest.Server { mux := api.MakeHandler(svc, instanceID) return httptest.NewServer(mux) } diff --git a/http/api/transport.go b/http/api/transport.go index 8fdd3ce4e4..7d0d11d4a3 100644 --- a/http/api/transport.go +++ b/http/api/transport.go @@ -17,13 +17,12 @@ import ( kithttp "github.com/go-kit/kit/transport/http" "github.com/go-zoo/bone" "github.com/mainflux/mainflux" - "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" - adapter "github.com/mainflux/mainflux/http" "github.com/mainflux/mainflux/internal/apiutil" "github.com/mainflux/mainflux/pkg/errors" "github.com/mainflux/mainflux/pkg/messaging" "github.com/prometheus/client_golang/prometheus/promhttp" + "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) @@ -35,9 +34,7 @@ const ( contentType = "application/json" ) -var ( - errMalformedSubtopic = errors.New("malformed subtopic") -) +var errMalformedSubtopic = errors.New("malformed subtopic") var channelPartRegExp = regexp.MustCompile(`^/channels/([\w\-]+)/messages(/[^?]*)?(\?.*)?$`) diff --git a/internal/clients/grpc/auth/client.go b/internal/clients/grpc/auth/client.go index dae42e20f5..2f4724f385 100644 --- a/internal/clients/grpc/auth/client.go +++ b/internal/clients/grpc/auth/client.go @@ -4,7 +4,7 @@ package auth import ( - grpcClient "github.com/mainflux/mainflux/internal/clients/grpc" + grpcclient "github.com/mainflux/mainflux/internal/clients/grpc" "github.com/mainflux/mainflux/internal/env" "github.com/mainflux/mainflux/pkg/errors" "github.com/mainflux/mainflux/users/policies" @@ -16,12 +16,12 @@ const envAuthGrpcPrefix = "MF_AUTH_GRPC_" var errGrpcConfig = errors.New("failed to load grpc configuration") // Setup loads Auth gRPC configuration from environment variable and creates new Auth gRPC API. -func Setup(svcName string) (policies.AuthServiceClient, grpcClient.ClientHandler, error) { - config := grpcClient.Config{} +func Setup(svcName string) (policies.AuthServiceClient, grpcclient.ClientHandler, error) { + config := grpcclient.Config{} if err := env.Parse(&config, env.Options{Prefix: envAuthGrpcPrefix}); err != nil { return nil, nil, errors.Wrap(errGrpcConfig, err) } - c, ch, err := grpcClient.Setup(config, svcName) + c, ch, err := grpcclient.Setup(config, svcName) if err != nil { return nil, nil, err } diff --git a/internal/clients/grpc/things/client.go b/internal/clients/grpc/things/client.go index 0d97582c61..01fa0f9db0 100644 --- a/internal/clients/grpc/things/client.go +++ b/internal/clients/grpc/things/client.go @@ -4,7 +4,7 @@ package things import ( - grpcClient "github.com/mainflux/mainflux/internal/clients/grpc" + grpcclient "github.com/mainflux/mainflux/internal/clients/grpc" "github.com/mainflux/mainflux/internal/env" "github.com/mainflux/mainflux/pkg/errors" "github.com/mainflux/mainflux/things/policies" @@ -16,13 +16,13 @@ const envThingsAuthGrpcPrefix = "MF_THINGS_AUTH_GRPC_" var errGrpcConfig = errors.New("failed to load grpc configuration") // Setup loads Things gRPC configuration from environment variable and creates new Things gRPC API. -func Setup() (policies.AuthServiceClient, grpcClient.ClientHandler, error) { - config := grpcClient.Config{} +func Setup() (policies.AuthServiceClient, grpcclient.ClientHandler, error) { + config := grpcclient.Config{} if err := env.Parse(&config, env.Options{Prefix: envThingsAuthGrpcPrefix}); err != nil { return nil, nil, errors.Wrap(errGrpcConfig, err) } - c, ch, err := grpcClient.Setup(config, "things") + c, ch, err := grpcclient.Setup(config, "things") if err != nil { return nil, nil, err } diff --git a/internal/clients/jaeger/provider.go b/internal/clients/jaeger/provider.go index 7fbfc2ba3a..f046d0c01d 100644 --- a/internal/clients/jaeger/provider.go +++ b/internal/clients/jaeger/provider.go @@ -10,7 +10,7 @@ import ( jaegerp "go.opentelemetry.io/contrib/propagators/jaeger" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" - "go.opentelemetry.io/otel/exporters/jaeger" + jaegerexp "go.opentelemetry.io/otel/exporters/jaeger" "go.opentelemetry.io/otel/sdk/resource" tracesdk "go.opentelemetry.io/otel/sdk/trace" semconv "go.opentelemetry.io/otel/semconv/v1.12.0" @@ -31,7 +31,7 @@ func NewProvider(svcName, url, instanceID string) (*tracesdk.TracerProvider, err return nil, errNoSvcName } - exporter, err := jaeger.New(jaeger.WithCollectorEndpoint(jaeger.WithEndpoint(url))) + exporter, err := jaegerexp.New(jaegerexp.WithCollectorEndpoint(jaegerexp.WithEndpoint(url))) if err != nil { return nil, err } diff --git a/internal/close.go b/internal/close.go index 5c92a0379a..0e1ab4da35 100644 --- a/internal/close.go +++ b/internal/close.go @@ -4,11 +4,11 @@ package internal import ( - grpcClient "github.com/mainflux/mainflux/internal/clients/grpc" + "github.com/mainflux/mainflux/internal/clients/grpc" mflog "github.com/mainflux/mainflux/logger" ) -func Close(log mflog.Logger, clientHandler grpcClient.ClientHandler) { +func Close(log mflog.Logger, clientHandler grpc.ClientHandler) { if err := clientHandler.Close(); err != nil { log.Warn(err.Error()) } diff --git a/internal/env/parser_test.go b/internal/env/parser_test.go index cb2eca6b7e..90680d0a7f 100644 --- a/internal/env/parser_test.go +++ b/internal/env/parser_test.go @@ -5,10 +5,9 @@ import ( "testing" "time" - "github.com/mainflux/mainflux/pkg/errors" - "github.com/mainflux/mainflux/internal/clients/grpc" "github.com/mainflux/mainflux/internal/server" + "github.com/mainflux/mainflux/pkg/errors" "github.com/stretchr/testify/assert" ) diff --git a/internal/server/coap/coap.go b/internal/server/coap/coap.go index 5a097a3367..007a85b481 100644 --- a/internal/server/coap/coap.go +++ b/internal/server/coap/coap.go @@ -68,7 +68,6 @@ func (s *Server) Start() error { case err := <-errCh: return err } - } func (s *Server) Stop() error { diff --git a/internal/server/http/http.go b/internal/server/http/http.go index 1b91aa061d..12462ccc44 100644 --- a/internal/server/http/http.go +++ b/internal/server/http/http.go @@ -9,7 +9,7 @@ import ( "net/http" "time" - mfserver "github.com/mainflux/mainflux/internal/server" + "github.com/mainflux/mainflux/internal/server" "github.com/mainflux/mainflux/logger" ) @@ -20,17 +20,17 @@ const ( ) type Server struct { - mfserver.BaseServer + server.BaseServer server *http.Server } -var _ mfserver.Server = (*Server)(nil) +var _ server.Server = (*Server)(nil) -func New(ctx context.Context, cancel context.CancelFunc, name string, config mfserver.Config, handler http.Handler, logger logger.Logger) mfserver.Server { +func New(ctx context.Context, cancel context.CancelFunc, name string, config server.Config, handler http.Handler, logger logger.Logger) server.Server { listenFullAddress := fmt.Sprintf("%s:%s", config.Host, config.Port) - server := &http.Server{Addr: listenFullAddress, Handler: handler} + httpServer := &http.Server{Addr: listenFullAddress, Handler: handler} return &Server{ - BaseServer: mfserver.BaseServer{ + BaseServer: server.BaseServer{ Ctx: ctx, Cancel: cancel, Name: name, @@ -38,7 +38,7 @@ func New(ctx context.Context, cancel context.CancelFunc, name string, config mfs Config: config, Logger: logger, }, - server: server, + server: httpServer, } } diff --git a/logger/logger_test.go b/logger/logger_test.go index 8ac096aceb..7881a39f19 100644 --- a/logger/logger_test.go +++ b/logger/logger_test.go @@ -23,10 +23,12 @@ const ( testFlagVal = "assert_test" ) -var _ io.Writer = (*mockWriter)(nil) -var logger mflog.Logger -var err error -var output logMsg +var ( + _ io.Writer = (*mockWriter)(nil) + logger mflog.Logger + err error + output logMsg +) type mockWriter struct { value []byte diff --git a/lora/mqtt/sub.go b/lora/mqtt/sub.go index 7f0f3f12c8..9613e60c9a 100644 --- a/lora/mqtt/sub.go +++ b/lora/mqtt/sub.go @@ -7,10 +7,9 @@ import ( "fmt" "time" + mqtt "github.com/eclipse/paho.mqtt.golang" "github.com/mainflux/mainflux/logger" "github.com/mainflux/mainflux/lora" - - mqtt "github.com/eclipse/paho.mqtt.golang" ) // Subscriber represents the MQTT broker. diff --git a/mqtt/forwarder.go b/mqtt/forwarder.go index 6755031e8a..425e615d67 100644 --- a/mqtt/forwarder.go +++ b/mqtt/forwarder.go @@ -60,7 +60,6 @@ type handleFunc func(msg *messaging.Message) error func (h handleFunc) Handle(msg *messaging.Message) error { return h(msg) - } func (h handleFunc) Cancel() error { diff --git a/mqtt/handler.go b/mqtt/handler.go index 82bbb2657d..d6fc024baa 100644 --- a/mqtt/handler.go +++ b/mqtt/handler.go @@ -16,7 +16,6 @@ import ( "github.com/mainflux/mainflux/pkg/errors" "github.com/mainflux/mainflux/pkg/messaging" "github.com/mainflux/mainflux/things/policies" - "github.com/mainflux/mproxy/pkg/session" ) @@ -63,8 +62,7 @@ type handler struct { } // NewHandler creates new Handler entity. -func NewHandler(publishers []messaging.Publisher, es redis.EventStore, - logger logger.Logger, auth policies.AuthServiceClient) session.Handler { +func NewHandler(publishers []messaging.Publisher, es redis.EventStore, logger logger.Logger, auth policies.AuthServiceClient) session.Handler { return &handler{ es: es, logger: logger, @@ -135,7 +133,6 @@ func (h *handler) AuthSubscribe(ctx context.Context, topics *[]string) error { if err := h.authAccess(ctx, string(s.Password), v, policies.ReadAction); err != nil { return err } - } return nil diff --git a/mqtt/redis/events.go b/mqtt/redis/events.go index 670e83ab5e..14562e8385 100644 --- a/mqtt/redis/events.go +++ b/mqtt/redis/events.go @@ -5,9 +5,7 @@ package redis import "github.com/mainflux/mainflux/internal/clients/redis" -var ( - _ redis.Event = (*mqttEvent)(nil) -) +var _ redis.Event = (*mqttEvent)(nil) type mqttEvent struct { clientID string diff --git a/mqtt/tracing/forwarder.go b/mqtt/tracing/forwarder.go index 301ab83394..b39ab2165d 100644 --- a/mqtt/tracing/forwarder.go +++ b/mqtt/tracing/forwarder.go @@ -37,7 +37,7 @@ func New(config server.Config, tracer trace.Tracer, forwarder mqtt.Forwarder, to // Forward traces mqtt forward operations. func (fm *forwarderMiddleware) Forward(ctx context.Context, id string, sub messaging.Subscriber, pub messaging.Publisher) error { - var subject = fmt.Sprintf("channels.%s.messages", fm.topic) + subject := fmt.Sprintf("channels.%s.messages", fm.topic) spanName := fmt.Sprintf("%s %s", subject, forwardOP) ctx, span := fm.tracer.Start(ctx, diff --git a/opcua/db/subs.go b/opcua/db/subs.go index d0043ca7ca..ce8c9fcefe 100644 --- a/opcua/db/subs.go +++ b/opcua/db/subs.go @@ -11,8 +11,10 @@ import ( "github.com/mainflux/mainflux/pkg/errors" ) -const columns = 2 -const path = "/store/nodes.csv" +const ( + columns = 2 + path = "/store/nodes.csv" +) var ( errNotFound = errors.New("file not found") diff --git a/opcua/gopcua/browser.go b/opcua/gopcua/browser.go index f91de38a20..61a774297b 100644 --- a/opcua/gopcua/browser.go +++ b/opcua/gopcua/browser.go @@ -6,9 +6,9 @@ package gopcua import ( "context" - opcuaGopcua "github.com/gopcua/opcua" + opcuagocpua "github.com/gopcua/opcua" "github.com/gopcua/opcua/id" - uaGopcua "github.com/gopcua/opcua/ua" + uagocpua "github.com/gopcua/opcua/ua" "github.com/mainflux/mainflux/logger" "github.com/mainflux/mainflux/opcua" "github.com/mainflux/mainflux/pkg/errors" @@ -18,11 +18,11 @@ const maxChildrens = 4 // max browsing node children level // NodeDef represents the node browser responnse. type NodeDef struct { - NodeID *uaGopcua.NodeID - NodeClass uaGopcua.NodeClass + NodeID *uagocpua.NodeID + NodeClass uagocpua.NodeClass BrowseName string Description string - AccessLevel uaGopcua.AccessLevelType + AccessLevel uagocpua.AccessLevelType Path string DataType string Writable bool @@ -48,11 +48,11 @@ func NewBrowser(ctx context.Context, log logger.Logger) opcua.Browser { } func (c browser) Browse(serverURI, nodeID string) ([]opcua.BrowsedNode, error) { - opts := []opcuaGopcua.Option{ - opcuaGopcua.SecurityMode(uaGopcua.MessageSecurityModeNone), + opts := []opcuagocpua.Option{ + opcuagocpua.SecurityMode(uagocpua.MessageSecurityModeNone), } - oc := opcuaGopcua.NewClient(serverURI, opts...) + oc := opcuagocpua.NewClient(serverURI, opts...) if err := oc.Connect(c.ctx); err != nil { return nil, errors.Wrap(errFailedConn, err) } @@ -79,67 +79,67 @@ func (c browser) Browse(serverURI, nodeID string) ([]opcua.BrowsedNode, error) { return nodes, nil } -func browse(oc *opcuaGopcua.Client, nodeID, path string, level int) ([]NodeDef, error) { +func browse(oc *opcuagocpua.Client, nodeID, path string, level int) ([]NodeDef, error) { if level > maxChildrens { return nil, nil } - nid, err := uaGopcua.ParseNodeID(nodeID) + nid, err := uagocpua.ParseNodeID(nodeID) if err != nil { return []NodeDef{}, err } n := oc.Node(nid) attrs, err := n.Attributes( - uaGopcua.AttributeIDNodeClass, - uaGopcua.AttributeIDBrowseName, - uaGopcua.AttributeIDDescription, - uaGopcua.AttributeIDAccessLevel, - uaGopcua.AttributeIDDataType, + uagocpua.AttributeIDNodeClass, + uagocpua.AttributeIDBrowseName, + uagocpua.AttributeIDDescription, + uagocpua.AttributeIDAccessLevel, + uagocpua.AttributeIDDataType, ) if err != nil { return nil, err } - var def = NodeDef{ + def := NodeDef{ NodeID: n.ID, } switch err := attrs[0].Status; err { - case uaGopcua.StatusOK: - def.NodeClass = uaGopcua.NodeClass(attrs[0].Value.Int()) + case uagocpua.StatusOK: + def.NodeClass = uagocpua.NodeClass(attrs[0].Value.Int()) default: return nil, err } switch err := attrs[1].Status; err { - case uaGopcua.StatusOK: + case uagocpua.StatusOK: def.BrowseName = attrs[1].Value.String() default: return nil, err } switch err := attrs[2].Status; err { - case uaGopcua.StatusOK: + case uagocpua.StatusOK: def.Description = attrs[2].Value.String() - case uaGopcua.StatusBadAttributeIDInvalid: + case uagocpua.StatusBadAttributeIDInvalid: // ignore default: return nil, err } switch err := attrs[3].Status; err { - case uaGopcua.StatusOK: - def.AccessLevel = uaGopcua.AccessLevelType(attrs[3].Value.Int()) - def.Writable = def.AccessLevel&uaGopcua.AccessLevelTypeCurrentWrite == uaGopcua.AccessLevelTypeCurrentWrite - case uaGopcua.StatusBadAttributeIDInvalid: + case uagocpua.StatusOK: + def.AccessLevel = uagocpua.AccessLevelType(attrs[3].Value.Int()) + def.Writable = def.AccessLevel&uagocpua.AccessLevelTypeCurrentWrite == uagocpua.AccessLevelTypeCurrentWrite + case uagocpua.StatusBadAttributeIDInvalid: // ignore default: return nil, err } switch err := attrs[4].Status; err { - case uaGopcua.StatusOK: + case uagocpua.StatusOK: switch v := attrs[4].Value.NodeID().IntID(); v { case id.DateTime: def.DataType = "time.Time" @@ -168,7 +168,7 @@ func browse(oc *opcuaGopcua.Client, nodeID, path string, level int) ([]NodeDef, default: def.DataType = attrs[4].Value.NodeID().String() } - case uaGopcua.StatusBadAttributeIDInvalid: + case uagocpua.StatusBadAttributeIDInvalid: // ignore default: return nil, err @@ -177,7 +177,7 @@ func browse(oc *opcuaGopcua.Client, nodeID, path string, level int) ([]NodeDef, def.Path = join(path, def.BrowseName) var nodes []NodeDef - if def.NodeClass == uaGopcua.NodeClassVariable { + if def.NodeClass == uagocpua.NodeClassVariable { nodes = append(nodes, def) } @@ -202,9 +202,9 @@ func browse(oc *opcuaGopcua.Client, nodeID, path string, level int) ([]NodeDef, return nodes, nil } -func browseChildren(c *opcuaGopcua.Client, n *opcuaGopcua.Node, path string, level int, typeDef uint32) ([]NodeDef, error) { +func browseChildren(c *opcuagocpua.Client, n *opcuagocpua.Node, path string, level int, typeDef uint32) ([]NodeDef, error) { nodes := []NodeDef{} - refs, err := n.ReferencedNodes(typeDef, uaGopcua.BrowseDirectionForward, uaGopcua.NodeClassAll, true) + refs, err := n.ReferencedNodes(typeDef, uagocpua.BrowseDirectionForward, uagocpua.NodeClassAll, true) if err != nil { return []NodeDef{}, err } diff --git a/opcua/gopcua/subscribe.go b/opcua/gopcua/subscribe.go index 1a217a61a7..dacd8aa7c1 100644 --- a/opcua/gopcua/subscribe.go +++ b/opcua/gopcua/subscribe.go @@ -9,16 +9,18 @@ import ( "strconv" "time" - opcuaGopcua "github.com/gopcua/opcua" - uaGopcua "github.com/gopcua/opcua/ua" + opcuagopcua "github.com/gopcua/opcua" + uagopcua "github.com/gopcua/opcua/ua" "github.com/mainflux/mainflux/logger" "github.com/mainflux/mainflux/opcua" "github.com/mainflux/mainflux/pkg/errors" "github.com/mainflux/mainflux/pkg/messaging" ) -const protocol = "opcua" -const token = "" +const ( + protocol = "opcua" + token = "" +) var ( errNotFoundServerURI = errors.New("route map not found for Server URI") @@ -69,32 +71,32 @@ func NewSubscriber(ctx context.Context, publisher messaging.Publisher, thingsRM, // Subscribe subscribes to the OPC-UA Server. func (c client) Subscribe(ctx context.Context, cfg opcua.Config) error { - opts := []opcuaGopcua.Option{ - opcuaGopcua.SecurityMode(uaGopcua.MessageSecurityModeNone), + opts := []opcuagopcua.Option{ + opcuagopcua.SecurityMode(uagopcua.MessageSecurityModeNone), } if cfg.Mode != "" { - endpoints, err := opcuaGopcua.GetEndpoints(cfg.ServerURI) + endpoints, err := opcuagopcua.GetEndpoints(cfg.ServerURI) if err != nil { return errors.Wrap(errFailedFetchEndpoint, err) } - ep := opcuaGopcua.SelectEndpoint(endpoints, cfg.Policy, uaGopcua.MessageSecurityModeFromString(cfg.Mode)) + ep := opcuagopcua.SelectEndpoint(endpoints, cfg.Policy, uagopcua.MessageSecurityModeFromString(cfg.Mode)) if ep == nil { return errFailedFindEndpoint } - opts = []opcuaGopcua.Option{ - opcuaGopcua.SecurityPolicy(cfg.Policy), - opcuaGopcua.SecurityModeString(cfg.Mode), - opcuaGopcua.CertificateFile(cfg.CertFile), - opcuaGopcua.PrivateKeyFile(cfg.KeyFile), - opcuaGopcua.AuthAnonymous(), - opcuaGopcua.SecurityFromEndpoint(ep, uaGopcua.UserTokenTypeAnonymous), + opts = []opcuagopcua.Option{ + opcuagopcua.SecurityPolicy(cfg.Policy), + opcuagopcua.SecurityModeString(cfg.Mode), + opcuagopcua.CertificateFile(cfg.CertFile), + opcuagopcua.PrivateKeyFile(cfg.KeyFile), + opcuagopcua.AuthAnonymous(), + opcuagopcua.SecurityFromEndpoint(ep, uagopcua.UserTokenTypeAnonymous), } } - oc := opcuaGopcua.NewClient(cfg.ServerURI, opts...) + oc := opcuagopcua.NewClient(cfg.ServerURI, opts...) if err := oc.Connect(c.ctx); err != nil { return errors.Wrap(errFailedConn, err) } @@ -105,7 +107,7 @@ func (c client) Subscribe(ctx context.Context, cfg opcua.Config) error { return errors.Wrap(errFailedParseInterval, err) } - sub, err := oc.Subscribe(&opcuaGopcua.SubscriptionParameters{ + sub, err := oc.Subscribe(&opcuagopcua.SubscriptionParameters{ Interval: time.Duration(i) * time.Millisecond, }) if err != nil { @@ -124,20 +126,20 @@ func (c client) Subscribe(ctx context.Context, cfg opcua.Config) error { return nil } -func (c client) runHandler(ctx context.Context, sub *opcuaGopcua.Subscription, uri, node string) error { - nodeID, err := uaGopcua.ParseNodeID(node) +func (c client) runHandler(ctx context.Context, sub *opcuagopcua.Subscription, uri, node string) error { + nodeID, err := uagopcua.ParseNodeID(node) if err != nil { return errors.Wrap(errFailedParseNodeID, err) } // arbitrary client handle for the monitoring item handle := uint32(42) - miCreateRequest := opcuaGopcua.NewMonitoredItemCreateRequestWithDefaults(nodeID, uaGopcua.AttributeIDValue, handle) - res, err := sub.Monitor(uaGopcua.TimestampsToReturnBoth, miCreateRequest) + miCreateRequest := opcuagopcua.NewMonitoredItemCreateRequestWithDefaults(nodeID, uagopcua.AttributeIDValue, handle) + res, err := sub.Monitor(uagopcua.TimestampsToReturnBoth, miCreateRequest) if err != nil { return errors.Wrap(errFailedCreateReq, err) } - if res.Results[0].StatusCode != uaGopcua.StatusOK { + if res.Results[0].StatusCode != uagopcua.StatusOK { return errResponseStatus } @@ -156,7 +158,7 @@ func (c client) runHandler(ctx context.Context, sub *opcuaGopcua.Subscription, u } switch x := res.Value.(type) { - case *uaGopcua.DataChangeNotification: + case *uagopcua.DataChangeNotification: for _, item := range x.MonitoredItems { msg := message{ ServerURI: uri, @@ -167,24 +169,24 @@ func (c client) runHandler(ctx context.Context, sub *opcuaGopcua.Subscription, u } switch item.Value.Value.Type() { - case uaGopcua.TypeIDBoolean: + case uagopcua.TypeIDBoolean: msg.DataKey = "vb" msg.Data = item.Value.Value.Bool() - case uaGopcua.TypeIDString, uaGopcua.TypeIDByteString: + case uagopcua.TypeIDString, uagopcua.TypeIDByteString: msg.DataKey = "vs" msg.Data = item.Value.Value.String() - case uaGopcua.TypeIDDataValue: + case uagopcua.TypeIDDataValue: msg.DataKey = "vd" msg.Data = item.Value.Value.String() - case uaGopcua.TypeIDInt64, uaGopcua.TypeIDInt32, uaGopcua.TypeIDInt16: + case uagopcua.TypeIDInt64, uagopcua.TypeIDInt32, uagopcua.TypeIDInt16: msg.Data = float64(item.Value.Value.Int()) - case uaGopcua.TypeIDUint64, uaGopcua.TypeIDUint32, uaGopcua.TypeIDUint16: + case uagopcua.TypeIDUint64, uagopcua.TypeIDUint32, uagopcua.TypeIDUint16: msg.Data = float64(item.Value.Value.Uint()) - case uaGopcua.TypeIDFloat, uaGopcua.TypeIDDouble: + case uagopcua.TypeIDFloat, uagopcua.TypeIDDouble: msg.Data = item.Value.Value.Float() - case uaGopcua.TypeIDByte: + case uagopcua.TypeIDByte: msg.Data = float64(item.Value.Value.Uint()) - case uaGopcua.TypeIDDateTime: + case uagopcua.TypeIDDateTime: msg.Data = item.Value.Value.Time().Unix() default: msg.Data = 0 diff --git a/pkg/clients/clients.go b/pkg/clients/clients.go index 7e87a195d0..94c1073cd9 100644 --- a/pkg/clients/clients.go +++ b/pkg/clients/clients.go @@ -68,7 +68,6 @@ type MembersPage struct { // Repository specifies an account persistence API. type Repository interface { - // RetrieveByID retrieves client by its unique ID. RetrieveByID(ctx context.Context, id string) (Client, error) diff --git a/pkg/clients/postgres/clients_test.go b/pkg/clients/postgres/clients_test.go index 712ed4420f..e69a330049 100644 --- a/pkg/clients/postgres/clients_test.go +++ b/pkg/clients/postgres/clients_test.go @@ -105,8 +105,8 @@ func TestClientsRetrieveAll(t *testing.T) { grepo := gpostgres.New(database) prepo := ppostgres.NewRepository(database) - var nClients = uint64(200) - var ownerID = testsutil.GenerateUUID(t, idProvider) + nClients := uint64(200) + ownerID := testsutil.GenerateUUID(t, idProvider) meta := mfclients.Metadata{ "admin": "true", @@ -114,9 +114,9 @@ func TestClientsRetrieveAll(t *testing.T) { wrongMeta := mfclients.Metadata{ "admin": "false", } - var expectedClients = []mfclients.Client{} + expectedClients := []mfclients.Client{} - var sharedGroup = mfgroups.Group{ + sharedGroup := mfgroups.Group{ ID: testsutil.GenerateUUID(t, idProvider), Name: "shared-group", } @@ -146,7 +146,7 @@ func TestClientsRetrieveAll(t *testing.T) { client, err = repo.Save(context.Background(), client) require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err)) expectedClients = append(expectedClients, client) - var policy = policies.Policy{ + policy := policies.Policy{ Subject: client.ID, Object: sharedGroup.ID, Actions: []string{"c_list"}, @@ -218,7 +218,8 @@ func TestClientsRetrieveAll(t *testing.T) { Metadata: meta, Status: mfclients.AllStatus, }, - response: []mfclients.Client{expectedClients[0], expectedClients[10], expectedClients[20], expectedClients[30], expectedClients[40], expectedClients[50], expectedClients[60], + response: []mfclients.Client{ + expectedClients[0], expectedClients[10], expectedClients[20], expectedClients[30], expectedClients[40], expectedClients[50], expectedClients[60], expectedClients[70], expectedClients[80], expectedClients[90], expectedClients[100], expectedClients[110], expectedClients[120], expectedClients[130], expectedClients[140], expectedClients[150], expectedClients[160], expectedClients[170], expectedClients[180], expectedClients[190], }, @@ -265,7 +266,8 @@ func TestClientsRetrieveAll(t *testing.T) { Owner: ownerID, Status: mfclients.AllStatus, }, - response: []mfclients.Client{expectedClients[0], expectedClients[10], expectedClients[20], expectedClients[30], expectedClients[40], expectedClients[50], expectedClients[60], + response: []mfclients.Client{ + expectedClients[0], expectedClients[10], expectedClients[20], expectedClients[30], expectedClients[40], expectedClients[50], expectedClients[60], expectedClients[70], expectedClients[80], expectedClients[90], expectedClients[100], expectedClients[110], expectedClients[120], expectedClients[130], expectedClients[140], expectedClients[150], expectedClients[160], expectedClients[170], expectedClients[180], expectedClients[190], }, @@ -291,7 +293,8 @@ func TestClientsRetrieveAll(t *testing.T) { Action: "c_list", Status: mfclients.AllStatus, }, - response: []mfclients.Client{expectedClients[0], expectedClients[10], expectedClients[20], expectedClients[30], expectedClients[40], expectedClients[50], expectedClients[60], + response: []mfclients.Client{ + expectedClients[0], expectedClients[10], expectedClients[20], expectedClients[30], expectedClients[40], expectedClients[50], expectedClients[60], expectedClients[70], expectedClients[80], expectedClients[90], expectedClients[100], expectedClients[110], expectedClients[120], expectedClients[130], expectedClients[140], expectedClients[150], expectedClients[160], expectedClients[170], expectedClients[180], expectedClients[190], }, @@ -306,7 +309,8 @@ func TestClientsRetrieveAll(t *testing.T) { Owner: ownerID, Status: mfclients.AllStatus, }, - response: []mfclients.Client{expectedClients[0], expectedClients[10], expectedClients[20], expectedClients[30], expectedClients[40], expectedClients[50], expectedClients[60], + response: []mfclients.Client{ + expectedClients[0], expectedClients[10], expectedClients[20], expectedClients[30], expectedClients[40], expectedClients[50], expectedClients[60], expectedClients[70], expectedClients[80], expectedClients[90], expectedClients[100], expectedClients[110], expectedClients[120], expectedClients[130], expectedClients[140], expectedClients[150], expectedClients[160], expectedClients[170], expectedClients[180], expectedClients[190], }, @@ -350,7 +354,8 @@ func TestClientsRetrieveAll(t *testing.T) { Tag: "Test", Status: mfclients.AllStatus, }, - response: []mfclients.Client{expectedClients[0], expectedClients[10], expectedClients[20], expectedClients[30], expectedClients[40], expectedClients[50], expectedClients[60], + response: []mfclients.Client{ + expectedClients[0], expectedClients[10], expectedClients[20], expectedClients[30], expectedClients[40], expectedClients[50], expectedClients[60], expectedClients[70], expectedClients[80], expectedClients[90], expectedClients[100], expectedClients[110], expectedClients[120], expectedClients[130], expectedClients[140], expectedClients[150], expectedClients[160], expectedClients[170], expectedClients[180], expectedClients[190], }, @@ -376,7 +381,8 @@ func TestClientsRetrieveAll(t *testing.T) { Status: mfclients.AllStatus, Action: "c_list", }, - response: []mfclients.Client{expectedClients[0], expectedClients[10], expectedClients[20], expectedClients[30], expectedClients[40], expectedClients[50], expectedClients[60], + response: []mfclients.Client{ + expectedClients[0], expectedClients[10], expectedClients[20], expectedClients[30], expectedClients[40], expectedClients[50], expectedClients[60], expectedClients[70], expectedClients[80], expectedClients[90], expectedClients[100], expectedClients[110], expectedClients[120], expectedClients[130], expectedClients[140], expectedClients[150], expectedClients[160], expectedClients[170], expectedClients[180], expectedClients[190], }, diff --git a/pkg/clients/status.go b/pkg/clients/status.go index ce9bc711b4..710a1b2f73 100644 --- a/pkg/clients/status.go +++ b/pkg/clients/status.go @@ -33,10 +33,8 @@ const ( Unknown = "unknown" ) -var ( - // ErrStatusAlreadyAssigned indicated that the client or group has already been assigned the status. - ErrStatusAlreadyAssigned = errors.New("status already assigned") -) +// ErrStatusAlreadyAssigned indicated that the client or group has already been assigned the status. +var ErrStatusAlreadyAssigned = errors.New("status already assigned") // String converts client/group status to string literal. func (s Status) String() string { diff --git a/pkg/errors/errors_test.go b/pkg/errors/errors_test.go index c569c7cfe3..f4b743e7da 100644 --- a/pkg/errors/errors_test.go +++ b/pkg/errors/errors_test.go @@ -9,7 +9,6 @@ import ( "testing" "github.com/mainflux/mainflux/pkg/errors" - "github.com/stretchr/testify/assert" ) @@ -121,7 +120,6 @@ func TestContains(t *testing.T) { contains := errors.Contains(tc.container, tc.contained) assert.Equal(t, tc.contains, contains, fmt.Sprintf("%s: expected %v to contain %v\n", tc.desc, tc.container, tc.contained)) } - } func TestWrap(t *testing.T) { diff --git a/pkg/errors/sdk_errors.go b/pkg/errors/sdk_errors.go index 98d75061e1..ac8b6ad5a0 100644 --- a/pkg/errors/sdk_errors.go +++ b/pkg/errors/sdk_errors.go @@ -12,10 +12,8 @@ import ( const errorKey = "error" -var ( - // Failed to read response body. - errRespBody = New("failed to read response body") -) +// Failed to read response body. +var errRespBody = New("failed to read response body") // SDKError is an error type for Mainflux SDK. type SDKError interface { @@ -86,7 +84,6 @@ func CheckError(resp *http.Response, expectedStatusCodes ...int) SDKError { if msg, ok := content[errorKey]; ok { if v, ok := msg.(string); ok { return NewSDKErrorWithStatus(New(v), resp.StatusCode) - } return NewSDKErrorWithStatus(fmt.Errorf("%v", msg), resp.StatusCode) } diff --git a/pkg/groups/postgres/groups.go b/pkg/groups/postgres/groups.go index 22bcb317d7..86dc561792 100644 --- a/pkg/groups/postgres/groups.go +++ b/pkg/groups/postgres/groups.go @@ -274,6 +274,7 @@ func buildHierachy(gm mfgroups.GroupsPage) string { } return query } + func buildQuery(gm mfgroups.GroupsPage) (string, error) { queries := []string{} diff --git a/pkg/groups/postgres/groups_test.go b/pkg/groups/postgres/groups_test.go index bcd7bb5e1e..f15167b539 100644 --- a/pkg/groups/postgres/groups_test.go +++ b/pkg/groups/postgres/groups_test.go @@ -168,7 +168,6 @@ func TestGroupSave(t *testing.T) { _, err := groupRepo.Save(context.Background(), tc.group) assert.True(t, errors.Contains(err, tc.err), fmt.Sprintf("%s: expected %s got %s\n", tc.desc, tc.err, err)) } - } func TestGroupRetrieveByID(t *testing.T) { @@ -223,8 +222,8 @@ func TestGroupRetrieveAll(t *testing.T) { t.Cleanup(func() { testsutil.CleanUpDB(t, db) }) groupRepo := gpostgres.New(database) - var nGroups = uint64(200) - var ownerID = testsutil.GenerateUUID(t, idProvider) + nGroups := uint64(200) + ownerID := testsutil.GenerateUUID(t, idProvider) var parentID string for i := uint64(0); i < nGroups; i++ { creationTime := time.Now().UTC() diff --git a/pkg/groups/postgres/setup_test.go b/pkg/groups/postgres/setup_test.go index 8e60561bb8..c2b87e9287 100644 --- a/pkg/groups/postgres/setup_test.go +++ b/pkg/groups/postgres/setup_test.go @@ -12,10 +12,10 @@ import ( "time" "github.com/jmoiron/sqlx" - pgClient "github.com/mainflux/mainflux/internal/clients/postgres" + pgclient "github.com/mainflux/mainflux/internal/clients/postgres" "github.com/mainflux/mainflux/internal/postgres" upostgres "github.com/mainflux/mainflux/users/postgres" - dockertest "github.com/ory/dockertest/v3" + "github.com/ory/dockertest/v3" "github.com/ory/dockertest/v3/docker" "go.opentelemetry.io/otel" ) @@ -64,7 +64,7 @@ func TestMain(m *testing.M) { log.Fatalf("Could not connect to docker: %s", err) } - dbConfig := pgClient.Config{ + dbConfig := pgclient.Config{ Host: "localhost", Port: port, User: "test", @@ -76,7 +76,7 @@ func TestMain(m *testing.M) { SSLRootCert: "", } - if db, err = pgClient.SetupDB(dbConfig, *upostgres.Migration()); err != nil { + if db, err = pgclient.SetupDB(dbConfig, *upostgres.Migration()); err != nil { log.Fatalf("Could not setup test DB connection: %s", err) } diff --git a/pkg/messaging/mqtt/pubsub_test.go b/pkg/messaging/mqtt/pubsub_test.go index 3043234d8f..27f7acaed9 100644 --- a/pkg/messaging/mqtt/pubsub_test.go +++ b/pkg/messaging/mqtt/pubsub_test.go @@ -12,7 +12,7 @@ import ( mqtt "github.com/eclipse/paho.mqtt.golang" "github.com/mainflux/mainflux/pkg/messaging" - mqtt_pubsub "github.com/mainflux/mainflux/pkg/messaging/mqtt" + mqttpubsub "github.com/mainflux/mainflux/pkg/messaging/mqtt" "github.com/stretchr/testify/assert" "google.golang.org/protobuf/proto" ) @@ -25,9 +25,7 @@ const ( tokenTimeout = 100 * time.Millisecond ) -var ( - data = []byte("payload") -) +var data = []byte("payload") // ErrFailedHandleMessage indicates that the message couldn't be handled. var errFailedHandleMessage = errors.New("failed to handle mainflux message") @@ -65,7 +63,7 @@ func TestPublisher(t *testing.T) { // Test publish with an empty topic. err = pubsub.Publish(context.TODO(), "", &messaging.Message{Payload: data}) - assert.Equal(t, err, mqtt_pubsub.ErrEmptyTopic, fmt.Sprintf("Publish with empty topic: expected: %s, got: %s", mqtt_pubsub.ErrEmptyTopic, err)) + assert.Equal(t, err, mqttpubsub.ErrEmptyTopic, fmt.Sprintf("Publish with empty topic: expected: %s, got: %s", mqttpubsub.ErrEmptyTopic, err)) cases := []struct { desc string @@ -175,14 +173,14 @@ func TestSubscribe(t *testing.T) { desc: "Subscribe to an empty topic with an ID", topic: "", clientID: "clientid1", - err: mqtt_pubsub.ErrEmptyTopic, + err: mqttpubsub.ErrEmptyTopic, handler: handler{false, "clientid1", msgChan}, }, { desc: "Subscribe to a topic with empty id", topic: topic, clientID: "", - err: mqtt_pubsub.ErrEmptyID, + err: mqttpubsub.ErrEmptyID, handler: handler{false, "", msgChan}, }, } @@ -250,14 +248,14 @@ func TestPubSub(t *testing.T) { desc: "Subscribe to an empty topic with an ID", topic: "", clientID: "clientid7", - err: mqtt_pubsub.ErrEmptyTopic, + err: mqttpubsub.ErrEmptyTopic, handler: handler{false, "clientid7", msgChan}, }, { desc: "Subscribe to a topic with empty id", topic: topic, clientID: "", - err: mqtt_pubsub.ErrEmptyID, + err: mqttpubsub.ErrEmptyID, handler: handler{false, "", msgChan}, }, } @@ -336,7 +334,7 @@ func TestUnsubscribe(t *testing.T) { desc: "Unsubscribe from a non-existent topic with an ID", topic: "h", clientID: "clientid4", - err: mqtt_pubsub.ErrNotSubscribed, + err: mqttpubsub.ErrNotSubscribed, subscribe: false, handler: handler{false, "clientid4", msgChan}, }, @@ -344,7 +342,7 @@ func TestUnsubscribe(t *testing.T) { desc: "Unsubscribe from an already unsubscribed topic with an ID", topic: fmt.Sprintf("%s.%s", chansPrefix, topic), clientID: "clientid4", - err: mqtt_pubsub.ErrNotSubscribed, + err: mqttpubsub.ErrNotSubscribed, subscribe: false, handler: handler{false, "clientid4", msgChan}, }, @@ -368,7 +366,7 @@ func TestUnsubscribe(t *testing.T) { desc: "Unsubscribe from an already unsubscribed topic with a subtopic with an ID", topic: fmt.Sprintf("%s.%s.%s", chansPrefix, topic, subtopic), clientID: "clientid4", - err: mqtt_pubsub.ErrNotSubscribed, + err: mqttpubsub.ErrNotSubscribed, subscribe: false, handler: handler{false, "clientid4", msgChan}, }, @@ -376,7 +374,7 @@ func TestUnsubscribe(t *testing.T) { desc: "Unsubscribe from an empty topic with an ID", topic: "", clientID: "clientid4", - err: mqtt_pubsub.ErrEmptyTopic, + err: mqttpubsub.ErrEmptyTopic, subscribe: false, handler: handler{false, "clientid4", msgChan}, }, @@ -384,7 +382,7 @@ func TestUnsubscribe(t *testing.T) { desc: "Unsubscribe from a topic with empty ID", topic: fmt.Sprintf("%s.%s", chansPrefix, topic), clientID: "", - err: mqtt_pubsub.ErrEmptyID, + err: mqttpubsub.ErrEmptyID, subscribe: false, handler: handler{false, "", msgChan}, }, diff --git a/pkg/messaging/mqtt/setup_test.go b/pkg/messaging/mqtt/setup_test.go index 6683172267..e58588a1b0 100644 --- a/pkg/messaging/mqtt/setup_test.go +++ b/pkg/messaging/mqtt/setup_test.go @@ -15,7 +15,7 @@ import ( mqtt "github.com/eclipse/paho.mqtt.golang" mflog "github.com/mainflux/mainflux/logger" "github.com/mainflux/mainflux/pkg/messaging" - mqtt_pubsub "github.com/mainflux/mainflux/pkg/messaging/mqtt" + mqttpubsub "github.com/mainflux/mainflux/pkg/messaging/mqtt" "github.com/ory/dockertest/v3" ) @@ -57,7 +57,7 @@ func TestMain(m *testing.M) { } if err := pool.Retry(func() error { - pubsub, err = mqtt_pubsub.NewPubSub(address, "mainflux", brokerTimeout, logger) + pubsub, err = mqttpubsub.NewPubSub(address, "mainflux", brokerTimeout, logger) return err }); err != nil { log.Fatalf("Could not connect to docker: %s", err) @@ -104,7 +104,7 @@ func newClient(address, id string, timeout time.Duration) (mqtt.Client, error) { ok := token.WaitTimeout(timeout) if !ok { - return nil, mqtt_pubsub.ErrConnect + return nil, mqttpubsub.ErrConnect } if token.Error() != nil { diff --git a/pkg/messaging/nats/pubsub.go b/pkg/messaging/nats/pubsub.go index d982ffdd64..bf0f45e33f 100644 --- a/pkg/messaging/nats/pubsub.go +++ b/pkg/messaging/nats/pubsub.go @@ -9,11 +9,10 @@ import ( "fmt" "sync" - "google.golang.org/protobuf/proto" - mflog "github.com/mainflux/mainflux/logger" "github.com/mainflux/mainflux/pkg/messaging" broker "github.com/nats-io/nats.go" + "google.golang.org/protobuf/proto" ) const chansPrefix = "channels" diff --git a/pkg/messaging/nats/setup_test.go b/pkg/messaging/nats/setup_test.go index f8f35b8490..1d1c0ff35d 100644 --- a/pkg/messaging/nats/setup_test.go +++ b/pkg/messaging/nats/setup_test.go @@ -14,7 +14,7 @@ import ( mflog "github.com/mainflux/mainflux/logger" "github.com/mainflux/mainflux/pkg/messaging" "github.com/mainflux/mainflux/pkg/messaging/nats" - dockertest "github.com/ory/dockertest/v3" + "github.com/ory/dockertest/v3" ) var ( diff --git a/pkg/messaging/rabbitmq/setup_test.go b/pkg/messaging/rabbitmq/setup_test.go index 68ea69d1c4..77754466f5 100644 --- a/pkg/messaging/rabbitmq/setup_test.go +++ b/pkg/messaging/rabbitmq/setup_test.go @@ -14,7 +14,7 @@ import ( mflog "github.com/mainflux/mainflux/logger" "github.com/mainflux/mainflux/pkg/messaging" "github.com/mainflux/mainflux/pkg/messaging/rabbitmq" - dockertest "github.com/ory/dockertest/v3" + "github.com/ory/dockertest/v3" amqp "github.com/rabbitmq/amqp091-go" "github.com/stretchr/testify/assert" "google.golang.org/protobuf/proto" diff --git a/pkg/messaging/tracing/tracing.go b/pkg/messaging/tracing/tracing.go index a44d823391..06f5be9251 100644 --- a/pkg/messaging/tracing/tracing.go +++ b/pkg/messaging/tracing/tracing.go @@ -20,7 +20,7 @@ var defaultAttributes = []attribute.KeyValue{ } func CreateSpan(ctx context.Context, operation, clientID, topic, subTopic string, msgSize int, cfg server.Config, spanKind trace.SpanKind, tracer trace.Tracer) (context.Context, trace.Span) { - var subject = fmt.Sprintf("channels.%s.messages", topic) + subject := fmt.Sprintf("channels.%s.messages", topic) if subTopic != "" { subject = fmt.Sprintf("%s.%s", subject, subTopic) } diff --git a/pkg/sdk/go/certs_test.go b/pkg/sdk/go/certs_test.go index 284af5eaf6..9fb5aa9245 100644 --- a/pkg/sdk/go/certs_test.go +++ b/pkg/sdk/go/certs_test.go @@ -11,9 +11,6 @@ import ( "testing" "time" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - bsmocks "github.com/mainflux/mainflux/bootstrap/mocks" "github.com/mainflux/mainflux/certs" httpapi "github.com/mainflux/mainflux/certs/api" @@ -27,6 +24,8 @@ import ( "github.com/mainflux/mainflux/things/policies" pmocks "github.com/mainflux/mainflux/things/policies/mocks" upolicies "github.com/mainflux/mainflux/users/policies" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) const instanceID = "5de9b29a-feb9-11ed-be56-0242ac120002" diff --git a/pkg/sdk/go/channels_test.go b/pkg/sdk/go/channels_test.go index 7cf4b5e59d..df7e3949a1 100644 --- a/pkg/sdk/go/channels_test.go +++ b/pkg/sdk/go/channels_test.go @@ -409,7 +409,6 @@ func TestViewChannel(t *testing.T) { err errors.SDKError }{ { - desc: "view channel", token: adminToken, channelID: channel.ID, @@ -650,8 +649,8 @@ func TestListChannelsByThing(t *testing.T) { } mfsdk := sdk.NewSDK(conf) - var nChannels = uint64(100) - var aChannels = []sdk.Channel{} + nChannels := uint64(100) + aChannels := []sdk.Channel{} for i := uint64(1); i < nChannels; i++ { channel := sdk.Channel{ diff --git a/pkg/sdk/go/consumers_test.go b/pkg/sdk/go/consumers_test.go index 3994a7523f..aaeafbf9f4 100644 --- a/pkg/sdk/go/consumers_test.go +++ b/pkg/sdk/go/consumers_test.go @@ -9,9 +9,6 @@ import ( "net/http/httptest" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "github.com/mainflux/mainflux/consumers/notifiers" httpapi "github.com/mainflux/mainflux/consumers/notifiers/api" "github.com/mainflux/mainflux/consumers/notifiers/mocks" @@ -20,6 +17,8 @@ import ( "github.com/mainflux/mainflux/pkg/errors" sdk "github.com/mainflux/mainflux/pkg/sdk/go" "github.com/mainflux/mainflux/pkg/uuid" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) const wrongValue = "wrong_value" @@ -174,7 +173,7 @@ func TestListSubscription(t *testing.T) { } mfsdk := sdk.NewSDK(sdkConf) - var nSubs = 10 + nSubs := 10 subs := make([]sdk.Subscription, nSubs) for i := 0; i < nSubs; i++ { id, err := mfsdk.CreateSubscription(fmt.Sprintf("topic_%d", i), fmt.Sprintf("contact_%d", i), exampleUser1) diff --git a/pkg/sdk/go/groups.go b/pkg/sdk/go/groups.go index b67bca42fa..5980bd2c79 100644 --- a/pkg/sdk/go/groups.go +++ b/pkg/sdk/go/groups.go @@ -106,7 +106,6 @@ func (sdk mfSDK) Children(id string, pm PageMetadata, token string) (GroupsPage, } func (sdk mfSDK) getGroups(url, token string) (GroupsPage, errors.SDKError) { - _, body, err := sdk.processRequest(http.MethodGet, url, token, nil, nil, http.StatusOK) if err != nil { return GroupsPage{}, err diff --git a/pkg/sdk/go/groups_test.go b/pkg/sdk/go/groups_test.go index b18b0917a2..ba3d3875bf 100644 --- a/pkg/sdk/go/groups_test.go +++ b/pkg/sdk/go/groups_test.go @@ -535,6 +535,7 @@ func TestListChildrenGroups(t *testing.T) { repoCall1.Unset() } } + func TestViewGroup(t *testing.T) { cRepo := new(cmocks.Repository) gRepo := new(gmocks.Repository) @@ -568,7 +569,6 @@ func TestViewGroup(t *testing.T) { err errors.SDKError }{ { - desc: "view group", token: generateValidToken(t, csvc, cRepo), groupID: group.ID, @@ -799,8 +799,8 @@ func TestListMemberships(t *testing.T) { } mfsdk := sdk.NewSDK(conf) - var nGroups = uint64(100) - var aGroups = []sdk.Group{} + nGroups := uint64(100) + aGroups := []sdk.Group{} for i := uint64(1); i < nGroups; i++ { group := sdk.Group{ diff --git a/pkg/sdk/go/message.go b/pkg/sdk/go/message.go index dc3a986cd0..bdb2cd7379 100644 --- a/pkg/sdk/go/message.go +++ b/pkg/sdk/go/message.go @@ -40,7 +40,7 @@ func (sdk mfSDK) ReadMessages(chanName, token string) (MessagesPage, errors.SDKE url := fmt.Sprintf("%s/channels/%s/messages%s", sdk.readerURL, chanID, subtopicPart) - var header = make(map[string]string) + header := make(map[string]string) header["Content-Type"] = string(sdk.msgContentType) _, body, err := sdk.processRequest(http.MethodGet, url, token, nil, header, http.StatusOK) diff --git a/pkg/sdk/go/policies.go b/pkg/sdk/go/policies.go index 304046236f..39ec832f4f 100644 --- a/pkg/sdk/go/policies.go +++ b/pkg/sdk/go/policies.go @@ -168,7 +168,7 @@ func (sdk mfSDK) DeleteThingPolicy(p Policy, token string) errors.SDKError { } func (sdk mfSDK) Assign(actions []string, userID, groupID, token string) errors.SDKError { - var policy = Policy{ + policy := Policy{ Subject: userID, Object: groupID, Actions: actions, @@ -177,7 +177,7 @@ func (sdk mfSDK) Assign(actions []string, userID, groupID, token string) errors. } func (sdk mfSDK) Unassign(userID, groupID, token string) errors.SDKError { - var policy = Policy{ + policy := Policy{ Subject: userID, Object: groupID, } @@ -212,7 +212,7 @@ func (sdk mfSDK) Disconnect(connIDs ConnectionIDs, token string) errors.SDKError } func (sdk mfSDK) ConnectThing(thingID, channelID, token string) errors.SDKError { - var policy = Policy{ + policy := Policy{ Subject: thingID, Object: channelID, } @@ -221,7 +221,7 @@ func (sdk mfSDK) ConnectThing(thingID, channelID, token string) errors.SDKError } func (sdk mfSDK) DisconnectThing(thingID, channelID, token string) errors.SDKError { - var policy = Policy{ + policy := Policy{ Subject: thingID, Object: channelID, } diff --git a/pkg/sdk/go/policies_test.go b/pkg/sdk/go/policies_test.go index aa5df1816f..98f2dfe277 100644 --- a/pkg/sdk/go/policies_test.go +++ b/pkg/sdk/go/policies_test.go @@ -400,6 +400,7 @@ func TestAssign(t *testing.T) { repoCall1.Unset() } } + func TestUpdatePolicy(t *testing.T) { cRepo := new(umocks.Repository) pRepo := new(upmocks.Repository) @@ -544,8 +545,8 @@ func TestListPolicies(t *testing.T) { mfsdk := sdk.NewSDK(conf) id := generateUUID(t) - var nPolicy = uint64(10) - var aPolicies = []sdk.Policy{} + nPolicy := uint64(10) + aPolicies := []sdk.Policy{} for i := uint64(0); i < nPolicy; i++ { pr := sdk.Policy{ OwnerID: id, diff --git a/pkg/sdk/go/things.go b/pkg/sdk/go/things.go index b07622b4ce..28b1064182 100644 --- a/pkg/sdk/go/things.go +++ b/pkg/sdk/go/things.go @@ -168,7 +168,7 @@ func (sdk mfSDK) UpdateThingTags(t Thing, token string) (Thing, errors.SDKError) } func (sdk mfSDK) UpdateThingSecret(id, secret, token string) (Thing, errors.SDKError) { - var ucsr = updateThingSecretReq{Secret: secret} + ucsr := updateThingSecretReq{Secret: secret} data, err := json.Marshal(ucsr) if err != nil { diff --git a/pkg/sdk/go/things_test.go b/pkg/sdk/go/things_test.go index b39162a9d6..3fa1026395 100644 --- a/pkg/sdk/go/things_test.go +++ b/pkg/sdk/go/things_test.go @@ -496,8 +496,8 @@ func TestListThingsByChannel(t *testing.T) { } mfsdk := sdk.NewSDK(conf) - var nThing = uint64(10) - var aThings = []sdk.Thing{} + nThing := uint64(10) + aThings := []sdk.Thing{} for i := uint64(1); i < nThing; i++ { thing := sdk.Thing{ diff --git a/pkg/sdk/go/tokens.go b/pkg/sdk/go/tokens.go index 03ca5082c3..652ac202f3 100644 --- a/pkg/sdk/go/tokens.go +++ b/pkg/sdk/go/tokens.go @@ -17,7 +17,7 @@ type Token struct { } func (sdk mfSDK) CreateToken(user User) (Token, errors.SDKError) { - var treq = tokenReq{ + treq := tokenReq{ Identity: user.Credentials.Identity, Secret: user.Credentials.Secret, } @@ -48,7 +48,7 @@ func (sdk mfSDK) RefreshToken(token string) (Token, errors.SDKError) { return Token{}, sdkerr } - var t = Token{} + t := Token{} if err := json.Unmarshal(body, &t); err != nil { return Token{}, errors.NewSDKError(err) } diff --git a/pkg/sdk/go/users.go b/pkg/sdk/go/users.go index 64e7ad0926..fdb3b19628 100644 --- a/pkg/sdk/go/users.go +++ b/pkg/sdk/go/users.go @@ -190,7 +190,7 @@ func (sdk mfSDK) UpdateUserIdentity(user User, token string) (User, errors.SDKEr } func (sdk mfSDK) ResetPasswordRequest(email string) errors.SDKError { - var rpr = resetPasswordRequestreq{Email: email} + rpr := resetPasswordRequestreq{Email: email} data, err := json.Marshal(rpr) if err != nil { @@ -198,7 +198,7 @@ func (sdk mfSDK) ResetPasswordRequest(email string) errors.SDKError { } url := fmt.Sprintf("%s/%s/reset-request", sdk.usersURL, PasswordResetEndpoint) - var header = make(map[string]string) + header := make(map[string]string) header["Referer"] = sdk.HostURL _, _, sdkerr := sdk.processRequest(http.MethodPost, url, "", data, header, http.StatusCreated) @@ -207,7 +207,7 @@ func (sdk mfSDK) ResetPasswordRequest(email string) errors.SDKError { } func (sdk mfSDK) ResetPassword(password, confPass, token string) errors.SDKError { - var rpr = resetPasswordReq{Token: token, Password: password, ConfPass: confPass} + rpr := resetPasswordReq{Token: token, Password: password, ConfPass: confPass} data, err := json.Marshal(rpr) if err != nil { @@ -221,7 +221,7 @@ func (sdk mfSDK) ResetPassword(password, confPass, token string) errors.SDKError } func (sdk mfSDK) UpdatePassword(oldPass, newPass, token string) (User, errors.SDKError) { - var ucsr = updateClientSecretReq{OldSecret: oldPass, NewSecret: newPass} + ucsr := updateClientSecretReq{OldSecret: oldPass, NewSecret: newPass} data, err := json.Marshal(ucsr) if err != nil { diff --git a/pkg/sdk/go/users_test.go b/pkg/sdk/go/users_test.go index 2aad22882b..2cd757dd94 100644 --- a/pkg/sdk/go/users_test.go +++ b/pkg/sdk/go/users_test.go @@ -385,8 +385,8 @@ func TestListMembers(t *testing.T) { } mfsdk := sdk.NewSDK(conf) - var nClients = uint64(10) - var aClients = []sdk.User{} + nClients := uint64(10) + aClients := []sdk.User{} for i := uint64(1); i < nClients; i++ { client := sdk.User{ diff --git a/pkg/ulid/ulid.go b/pkg/ulid/ulid.go index ae797e1579..0359b107bb 100644 --- a/pkg/ulid/ulid.go +++ b/pkg/ulid/ulid.go @@ -5,13 +5,12 @@ package ulid import ( + "math/rand" "time" "github.com/mainflux/mainflux" "github.com/mainflux/mainflux/pkg/errors" "github.com/oklog/ulid/v2" - - mathrand "math/rand" ) // ErrGeneratingID indicates error in generating ULID. @@ -20,15 +19,15 @@ var ErrGeneratingID = errors.New("generating id failed") var _ mainflux.IDProvider = (*ulidProvider)(nil) type ulidProvider struct { - entropy *mathrand.Rand + entropy *rand.Rand } // New instantiates a ULID provider. func New() mainflux.IDProvider { seed := time.Now().UnixNano() - source := mathrand.NewSource(seed) + source := rand.NewSource(seed) return &ulidProvider{ - entropy: mathrand.New(source), + entropy: rand.New(source), } } diff --git a/provision/api/endpoint.go b/provision/api/endpoint.go index 6b01db1309..fa0d948e5d 100644 --- a/provision/api/endpoint.go +++ b/provision/api/endpoint.go @@ -32,7 +32,6 @@ func doProvision(svc provision.Service) endpoint.Endpoint { } return provisionResponse, nil - } } diff --git a/provision/api/requests_test.go b/provision/api/requests_test.go index 9ac7a1ffc3..0525e1c70b 100644 --- a/provision/api/requests_test.go +++ b/provision/api/requests_test.go @@ -10,7 +10,6 @@ import ( ) func TestValidate(t *testing.T) { - cases := map[string]struct { ExternalID string ExternalKey string diff --git a/provision/api/responses.go b/provision/api/responses.go index 1491271dc3..9d8aa8530e 100644 --- a/provision/api/responses.go +++ b/provision/api/responses.go @@ -3,12 +3,12 @@ package api import ( "net/http" - SDK "github.com/mainflux/mainflux/pkg/sdk/go" + sdk "github.com/mainflux/mainflux/pkg/sdk/go" ) type provisionRes struct { - Things []SDK.Thing `json:"things"` - Channels []SDK.Channel `json:"channels"` + Things []sdk.Thing `json:"things"` + Channels []sdk.Channel `json:"channels"` ClientCert map[string]string `json:"client_cert,omitempty"` ClientKey map[string]string `json:"client_key,omitempty"` CACert string `json:"ca_cert,omitempty"` diff --git a/provision/api/transport.go b/provision/api/transport.go index 9a89fa2fa8..9855becf59 100644 --- a/provision/api/transport.go +++ b/provision/api/transport.go @@ -22,7 +22,6 @@ const ( // MakeHandler returns a HTTP handler for API endpoints. func MakeHandler(svc provision.Service, logger logger.Logger, instanceID string) http.Handler { - opts := []kithttp.ServerOption{ kithttp.ServerErrorEncoder(apiutil.LoggingErrorEncoder(logger, encodeError)), } diff --git a/provision/config.go b/provision/config.go index 51e6f4e0f8..775e501c6d 100644 --- a/provision/config.go +++ b/provision/config.go @@ -72,7 +72,7 @@ func Save(c Config, file string) error { if err != nil { return errors.New(fmt.Sprintf("Error reading config file: %s", err)) } - if err := os.WriteFile(file, b, 0644); err != nil { + if err := os.WriteFile(file, b, 0o644); err != nil { return errors.New(fmt.Sprintf("Error writing toml: %s", err)) } return nil diff --git a/provision/service.go b/provision/service.go index 17cac8e176..2503e233fb 100644 --- a/provision/service.go +++ b/provision/service.go @@ -6,7 +6,7 @@ import ( mflog "github.com/mainflux/mainflux/logger" "github.com/mainflux/mainflux/pkg/errors" - SDK "github.com/mainflux/mainflux/pkg/sdk/go" + sdk "github.com/mainflux/mainflux/pkg/sdk/go" ) const ( @@ -66,14 +66,14 @@ type Service interface { type provisionService struct { logger mflog.Logger - sdk SDK.SDK + sdk sdk.SDK conf Config } // Result represent what is created with additional info. type Result struct { - Things []SDK.Thing `json:"things,omitempty"` - Channels []SDK.Channel `json:"channels,omitempty"` + Things []sdk.Thing `json:"things,omitempty"` + Channels []sdk.Channel `json:"channels,omitempty"` ClientCert map[string]string `json:"client_cert,omitempty"` ClientKey map[string]string `json:"client_key,omitempty"` CACert string `json:"ca_cert,omitempty"` @@ -82,7 +82,7 @@ type Result struct { } // New returns new provision service. -func New(cfg Config, sdk SDK.SDK, logger mflog.Logger) Service { +func New(cfg Config, sdk sdk.SDK, logger mflog.Logger) Service { return &provisionService{ logger: logger, conf: cfg, @@ -92,7 +92,7 @@ func New(cfg Config, sdk SDK.SDK, logger mflog.Logger) Service { // Mapping retrieves current configuration. func (ps *provisionService) Mapping(token string) (map[string]interface{}, error) { - userFilter := SDK.PageMetadata{ + userFilter := sdk.PageMetadata{ Email: "", Offset: uint64(offset), Limit: uint64(limit), @@ -108,8 +108,8 @@ func (ps *provisionService) Mapping(token string) (map[string]interface{}, error // Provision is provision method for creating setup according to // provision layout specified in config.toml. func (ps *provisionService) Provision(token, name, externalID, externalKey string) (res Result, err error) { - var channels []SDK.Channel - var things []SDK.Thing + var channels []sdk.Channel + var things []sdk.Thing defer ps.recover(&err, &things, &channels, &token) token, err = ps.createTokenIfEmpty(token) @@ -130,7 +130,7 @@ func (ps *provisionService) Provision(token, name, externalID, externalKey strin thing.Metadata[externalIDKey] = externalID } - th := SDK.Thing{ + th := sdk.Thing{ Metadata: thing.Metadata, } if name == "" { @@ -153,9 +153,9 @@ func (ps *provisionService) Provision(token, name, externalID, externalKey strin } for _, channel := range ps.conf.Channels { - ch := SDK.Channel{ + ch := sdk.Channel{ Name: channel.Name, - Metadata: SDK.Metadata(channel.Metadata), + Metadata: sdk.Metadata(channel.Metadata), } ch, err := ps.sdk.CreateChannel(ch, token) if err != nil { @@ -177,8 +177,8 @@ func (ps *provisionService) Provision(token, name, externalID, externalKey strin ClientKey: map[string]string{}, } - var cert SDK.Cert - var bsConfig SDK.BootstrapConfig + var cert sdk.Cert + var bsConfig sdk.BootstrapConfig for _, thing := range things { var chanIDs []string @@ -191,7 +191,7 @@ func (ps *provisionService) Provision(token, name, externalID, externalKey strin } if ps.conf.Bootstrap.Provision && needsBootstrap(thing) { - bsReq := SDK.BootstrapConfig{ + bsReq := sdk.BootstrapConfig{ ThingID: thing.ID, ExternalID: externalID, ExternalKey: externalKey, @@ -213,7 +213,7 @@ func (ps *provisionService) Provision(token, name, externalID, externalKey strin } if ps.conf.Bootstrap.X509Provision { - var cert SDK.Cert + var cert sdk.Cert cert, err = ps.sdk.IssueCert(thing.ID, ps.conf.Cert.TTL, token) if err != nil { @@ -233,7 +233,7 @@ func (ps *provisionService) Provision(token, name, externalID, externalKey strin } if ps.conf.Bootstrap.AutoWhiteList { - wlReq := SDK.BootstrapConfig{ + wlReq := sdk.BootstrapConfig{ ThingID: thing.ID, State: Active, } @@ -282,8 +282,8 @@ func (ps *provisionService) createTokenIfEmpty(token string) (string, error) { return token, ErrMissingCredentials } - u := SDK.User{ - Credentials: SDK.Credentials{ + u := sdk.User{ + Credentials: sdk.Credentials{ Identity: ps.conf.Server.MfUser, Secret: ps.conf.Server.MfPass, }, @@ -296,7 +296,7 @@ func (ps *provisionService) createTokenIfEmpty(token string) (string, error) { return tkn.AccessToken, nil } -func (ps *provisionService) updateGateway(token string, bs SDK.BootstrapConfig, channels []SDK.Channel) error { +func (ps *provisionService) updateGateway(token string, bs sdk.BootstrapConfig, channels []sdk.Channel) error { var gw Gateway for _, ch := range channels { switch ch.Metadata["type"] { @@ -336,7 +336,7 @@ func (ps *provisionService) errLog(err error) { } } -func clean(ps *provisionService, things []SDK.Thing, channels []SDK.Channel, token string) { +func clean(ps *provisionService, things []sdk.Thing, channels []sdk.Channel, token string) { for _, t := range things { _, err := ps.sdk.DisableThing(t.ID, token) ps.errLog(err) @@ -347,7 +347,7 @@ func clean(ps *provisionService, things []SDK.Thing, channels []SDK.Channel, tok } } -func (ps *provisionService) recover(e *error, ths *[]SDK.Thing, chs *[]SDK.Channel, tkn *string) { +func (ps *provisionService) recover(e *error, ths *[]sdk.Thing, chs *[]sdk.Channel, tkn *string) { if e == nil { return } @@ -372,7 +372,6 @@ func (ps *provisionService) recover(e *error, ths *[]SDK.Thing, chs *[]SDK.Chann if needsBootstrap(th) { ps.errLog(ps.sdk.RemoveBootstrap(th.ID, token)) } - } return } @@ -405,7 +404,7 @@ func (ps *provisionService) recover(e *error, ths *[]SDK.Thing, chs *[]SDK.Chann } } -func needsBootstrap(th SDK.Thing) bool { +func needsBootstrap(th sdk.Thing) bool { if th.Metadata == nil { return false } diff --git a/readers/api/transport.go b/readers/api/transport.go index 0da3c434f7..2025364c3e 100644 --- a/readers/api/transport.go +++ b/readers/api/transport.go @@ -50,7 +50,6 @@ var ( // MakeHandler returns a HTTP handler for API endpoints. func MakeHandler(svc readers.MessageRepository, tc tpolicies.AuthServiceClient, ac upolicies.AuthServiceClient, svcName, instanceID string) http.Handler { - opts := []kithttp.ServerOption{ kithttp.ServerErrorEncoder(encodeError), } diff --git a/readers/cassandra/messages_test.go b/readers/cassandra/messages_test.go index 5e4fe63224..de0042d362 100644 --- a/readers/cassandra/messages_test.go +++ b/readers/cassandra/messages_test.go @@ -10,7 +10,7 @@ import ( "time" cwriter "github.com/mainflux/mainflux/consumers/writers/cassandra" - casClient "github.com/mainflux/mainflux/internal/clients/cassandra" + casclient "github.com/mainflux/mainflux/internal/clients/cassandra" "github.com/mainflux/mainflux/pkg/transformers/json" "github.com/mainflux/mainflux/pkg/transformers/senml" "github.com/mainflux/mainflux/pkg/uuid" @@ -47,14 +47,14 @@ var ( ) func TestReadSenml(t *testing.T) { - session, err := casClient.Connect(casClient.Config{ + session, err := casclient.Connect(casclient.Config{ Hosts: []string{addr}, Keyspace: keyspace, }) require.Nil(t, err, fmt.Sprintf("failed to connect to Cassandra: %s", err)) defer session.Close() - err = casClient.InitDB(session, cwriter.Table) + err = casclient.InitDB(session, cwriter.Table) require.Nil(t, err, fmt.Sprintf("failed to initialize to Cassandra: %s", err)) writer := cwriter.New(session) @@ -416,7 +416,7 @@ func TestReadSenml(t *testing.T) { } func TestReadJSON(t *testing.T) { - session, err := casClient.Connect(casClient.Config{ + session, err := casclient.Connect(casclient.Config{ Hosts: []string{addr}, Keyspace: keyspace, }) diff --git a/readers/cassandra/setup_test.go b/readers/cassandra/setup_test.go index 3ff87f1c92..055c7924dd 100644 --- a/readers/cassandra/setup_test.go +++ b/readers/cassandra/setup_test.go @@ -9,9 +9,9 @@ import ( "testing" "github.com/gocql/gocql" - casClient "github.com/mainflux/mainflux/internal/clients/cassandra" + casclient "github.com/mainflux/mainflux/internal/clients/cassandra" mflog "github.com/mainflux/mainflux/logger" - dockertest "github.com/ory/dockertest/v3" + "github.com/ory/dockertest/v3" ) var logger, _ = mflog.New(os.Stdout, mflog.Info.String()) @@ -35,7 +35,7 @@ func TestMain(m *testing.M) { return err } - session, err := casClient.Connect(casClient.Config{ + session, err := casclient.Connect(casclient.Config{ Hosts: []string{addr}, Keyspace: keyspace, }) diff --git a/readers/influxdb/messages.go b/readers/influxdb/messages.go index 648e590371..9c466ec750 100644 --- a/readers/influxdb/messages.go +++ b/readers/influxdb/messages.go @@ -11,12 +11,11 @@ import ( "time" "unicode" - "github.com/mainflux/mainflux/pkg/errors" - "github.com/mainflux/mainflux/readers" - influxdb2 "github.com/influxdata/influxdb-client-go/v2" + "github.com/mainflux/mainflux/pkg/errors" jsont "github.com/mainflux/mainflux/pkg/transformers/json" "github.com/mainflux/mainflux/pkg/transformers/senml" + "github.com/mainflux/mainflux/readers" ) const ( @@ -26,9 +25,7 @@ const ( var _ readers.MessageRepository = (*influxRepository)(nil) -var ( - errResultTime = errors.New("invalid result time") -) +var errResultTime = errors.New("invalid result time") type RepoConfig struct { Bucket string @@ -106,7 +103,6 @@ func (repo *influxRepository) ReadAll(chanID string, rpm readers.PageMetadata) ( } return page, nil - } func (repo *influxRepository) count(measurement, condition string, timeRange string) (uint64, error) { @@ -128,7 +124,6 @@ func (repo *influxRepository) count(measurement, condition string, timeRange str condition) queryAPI := repo.client.QueryAPI(repo.cfg.Org) resp, err := queryAPI.Query(context.Background(), cmd) - if err != nil { return 0, err } diff --git a/readers/influxdb/messages_test.go b/readers/influxdb/messages_test.go index 3de3a03238..eb25318b62 100644 --- a/readers/influxdb/messages_test.go +++ b/readers/influxdb/messages_test.go @@ -9,14 +9,13 @@ import ( "testing" "time" - influxdata "github.com/influxdata/influxdb-client-go/v2" + influxdb2 "github.com/influxdata/influxdb-client-go/v2" iwriter "github.com/mainflux/mainflux/consumers/writers/influxdb" "github.com/mainflux/mainflux/pkg/transformers/json" "github.com/mainflux/mainflux/pkg/transformers/senml" "github.com/mainflux/mainflux/pkg/uuid" "github.com/mainflux/mainflux/readers" ireader "github.com/mainflux/mainflux/readers/influxdb" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -42,7 +41,7 @@ var ( vd string = "dataValue" sum float64 = 42 - client influxdata.Client + client influxdb2.Client repoCfg = struct { Bucket string Org string diff --git a/readers/influxdb/setup_test.go b/readers/influxdb/setup_test.go index c0291dbbaa..a924aee674 100644 --- a/readers/influxdb/setup_test.go +++ b/readers/influxdb/setup_test.go @@ -15,7 +15,7 @@ import ( influxdata "github.com/influxdata/influxdb-client-go/v2" mflog "github.com/mainflux/mainflux/logger" - dockertest "github.com/ory/dockertest/v3" + "github.com/ory/dockertest/v3" ) var ( diff --git a/readers/mongodb/messages_test.go b/readers/mongodb/messages_test.go index e180e90a3e..edd6da6071 100644 --- a/readers/mongodb/messages_test.go +++ b/readers/mongodb/messages_test.go @@ -17,7 +17,6 @@ import ( mreader "github.com/mainflux/mainflux/readers/mongodb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" ) diff --git a/readers/mongodb/setup_test.go b/readers/mongodb/setup_test.go index d246f17342..8ff094c76b 100644 --- a/readers/mongodb/setup_test.go +++ b/readers/mongodb/setup_test.go @@ -10,7 +10,7 @@ import ( "testing" mflog "github.com/mainflux/mainflux/logger" - dockertest "github.com/ory/dockertest/v3" + "github.com/ory/dockertest/v3" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" ) diff --git a/readers/postgres/messages_test.go b/readers/postgres/messages_test.go index 688b28bdcf..ece6f78597 100644 --- a/readers/postgres/messages_test.go +++ b/readers/postgres/messages_test.go @@ -15,7 +15,6 @@ import ( "github.com/mainflux/mainflux/pkg/uuid" "github.com/mainflux/mainflux/readers" preader "github.com/mainflux/mainflux/readers/postgres" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/readers/postgres/setup_test.go b/readers/postgres/setup_test.go index 9ca1746638..a7cfc77daf 100644 --- a/readers/postgres/setup_test.go +++ b/readers/postgres/setup_test.go @@ -14,7 +14,7 @@ import ( _ "github.com/jackc/pgx/v5/stdlib" // required for SQL access "github.com/jmoiron/sqlx" "github.com/mainflux/mainflux/readers/postgres" - dockertest "github.com/ory/dockertest/v3" + "github.com/ory/dockertest/v3" ) var db *sqlx.DB diff --git a/readers/timescale/setup_test.go b/readers/timescale/setup_test.go index 02b4c4b06a..89e2439d21 100644 --- a/readers/timescale/setup_test.go +++ b/readers/timescale/setup_test.go @@ -14,7 +14,7 @@ import ( _ "github.com/jackc/pgx/v5/stdlib" // required for SQL access "github.com/jmoiron/sqlx" "github.com/mainflux/mainflux/readers/timescale" - dockertest "github.com/ory/dockertest/v3" + "github.com/ory/dockertest/v3" ) var db *sqlx.DB diff --git a/things/clients/api/endpoints.go b/things/clients/api/endpoints.go index 78abaf9c6e..faadf7be11 100644 --- a/things/clients/api/endpoints.go +++ b/things/clients/api/endpoints.go @@ -170,7 +170,6 @@ func updateClientSecretEndpoint(svc clients.Service) endpoint.Endpoint { client, err := svc.UpdateClientSecret(ctx, req.token, req.id, req.Secret) if err != nil { return nil, err - } return updateClientRes{Client: client}, nil } diff --git a/things/clients/mocks/auth.go b/things/clients/mocks/auth.go index 89ac4a363c..bc9440ac94 100644 --- a/things/clients/mocks/auth.go +++ b/things/clients/mocks/auth.go @@ -42,7 +42,6 @@ func (svc authServiceMock) Authorize(ctx context.Context, req *policies.Authoriz return &policies.AuthorizeRes{Authorized: true}, nil } } - } return nil, errors.ErrAuthorization } diff --git a/things/clients/postgres/clients.go b/things/clients/postgres/clients.go index 1d920b132f..0790a97457 100644 --- a/things/clients/postgres/clients.go +++ b/things/clients/postgres/clients.go @@ -8,8 +8,6 @@ import ( "database/sql" "fmt" - // required for SQL access. - "github.com/mainflux/mainflux/internal/postgres" mfclients "github.com/mainflux/mainflux/pkg/clients" pgclients "github.com/mainflux/mainflux/pkg/clients/postgres" @@ -103,7 +101,6 @@ func (repo clientRepo) RetrieveBySecret(ctx context.Context, key string) (mfclie if err := repo.DB.QueryRowxContext(ctx, q, key).StructScan(&dbc); err != nil { if err == sql.ErrNoRows { return mfclients.Client{}, errors.Wrap(errors.ErrNotFound, err) - } return mfclients.Client{}, errors.Wrap(errors.ErrViewEntity, err) } diff --git a/things/clients/postgres/setup_test.go b/things/clients/postgres/setup_test.go index 8def51e4be..91c01ed21e 100644 --- a/things/clients/postgres/setup_test.go +++ b/things/clients/postgres/setup_test.go @@ -12,10 +12,10 @@ import ( "time" "github.com/jmoiron/sqlx" - pgClient "github.com/mainflux/mainflux/internal/clients/postgres" + pgclient "github.com/mainflux/mainflux/internal/clients/postgres" "github.com/mainflux/mainflux/internal/postgres" cpostgres "github.com/mainflux/mainflux/things/postgres" - dockertest "github.com/ory/dockertest/v3" + "github.com/ory/dockertest/v3" "github.com/ory/dockertest/v3/docker" "go.opentelemetry.io/otel" ) @@ -64,7 +64,7 @@ func TestMain(m *testing.M) { log.Fatalf("Could not connect to docker: %s", err) } - dbConfig := pgClient.Config{ + dbConfig := pgclient.Config{ Host: "localhost", Port: port, User: "test", @@ -76,11 +76,11 @@ func TestMain(m *testing.M) { SSLRootCert: "", } - if db, err = pgClient.SetupDB(dbConfig, *cpostgres.Migration()); err != nil { + if db, err = pgclient.SetupDB(dbConfig, *cpostgres.Migration()); err != nil { log.Fatalf("Could not setup test DB connection: %s", err) } - if db, err = pgClient.Connect(dbConfig); err != nil { + if db, err = pgclient.Connect(dbConfig); err != nil { log.Fatalf("Could not setup test DB connection: %s", err) } diff --git a/things/clients/service_test.go b/things/clients/service_test.go index 257871997d..8952bc039d 100644 --- a/things/clients/service_test.go +++ b/things/clients/service_test.go @@ -4,8 +4,8 @@ package clients_test import ( - context "context" - fmt "fmt" + "context" + "fmt" "testing" "time" @@ -318,9 +318,9 @@ func TestViewClient(t *testing.T) { func TestListClients(t *testing.T) { svc, cRepo, _ := newService(map[string]string{token: adminEmail}) - var nClients = uint64(200) - var aClients = []mfclients.Client{} - var OwnerID = testsutil.GenerateUUID(t, idProvider) + nClients := uint64(200) + aClients := []mfclients.Client{} + OwnerID := testsutil.GenerateUUID(t, idProvider) for i := uint64(1); i < nClients; i++ { identity := fmt.Sprintf("TestListClients_%d@example.com", i) client := mfclients.Client{ @@ -1034,8 +1034,8 @@ func TestDisableClient(t *testing.T) { func TestListMembers(t *testing.T) { svc, cRepo, _ := newService(map[string]string{token: adminEmail}) - var nClients = uint64(10) - var aClients = []mfclients.Client{} + nClients := uint64(10) + aClients := []mfclients.Client{} owner := testsutil.GenerateUUID(t, idProvider) for i := uint64(0); i < nClients; i++ { identity := fmt.Sprintf("member_%d@example.com", i) diff --git a/things/clients/tracing/tracing.go b/things/clients/tracing/tracing.go index 9454746cac..8995dd393e 100644 --- a/things/clients/tracing/tracing.go +++ b/things/clients/tracing/tracing.go @@ -71,7 +71,6 @@ func (tm *tracingMiddleware) UpdateClientSecret(ctx context.Context, token, oldS defer span.End() return tm.svc.UpdateClientSecret(ctx, token, oldSecret, newSecret) - } // UpdateClientOwner traces the "UpdateClientOwner" operation of the wrapped policies.Service. @@ -107,7 +106,6 @@ func (tm *tracingMiddleware) ListClientsByGroup(ctx context.Context, token, grou defer span.End() return tm.svc.ListClientsByGroup(ctx, token, groupID, pm) - } // ListMemberships traces the "ListMemberships" operation of the wrapped policies.Service. diff --git a/things/groups/api/endpoints.go b/things/groups/api/endpoints.go index a764432614..d3fd95788a 100644 --- a/things/groups/api/endpoints.go +++ b/things/groups/api/endpoints.go @@ -189,7 +189,6 @@ func buildGroupsResponseTree(page mfgroups.GroupsPage) groupPageRes { if children, ok := parentsMap[group.ID]; ok { group.Children = children } - } for _, group := range groupsMap { diff --git a/things/groups/api/transport.go b/things/groups/api/transport.go index 838685b019..b4bfdbd94d 100644 --- a/things/groups/api/transport.go +++ b/things/groups/api/transport.go @@ -144,7 +144,6 @@ func decodeListMembershipRequest(_ context.Context, r *http.Request) (interface{ }, } return req, nil - } func decodeListGroupsRequest(_ context.Context, r *http.Request) (interface{}, error) { diff --git a/things/groups/service_test.go b/things/groups/service_test.go index d57f9c9e82..74c17ac925 100644 --- a/things/groups/service_test.go +++ b/things/groups/service_test.go @@ -4,13 +4,13 @@ package groups_test import ( - context "context" - fmt "fmt" + "context" + "fmt" "testing" "time" "github.com/mainflux/mainflux/internal/testsutil" - mfclients "github.com/mainflux/mainflux/pkg/clients" + "github.com/mainflux/mainflux/pkg/clients" "github.com/mainflux/mainflux/pkg/errors" mfgroups "github.com/mainflux/mainflux/pkg/groups" "github.com/mainflux/mainflux/pkg/uuid" @@ -26,7 +26,7 @@ import ( var ( idProvider = uuid.New() - validGMetadata = mfclients.Metadata{"role": "client"} + validGMetadata = clients.Metadata{"role": "client"} inValidToken = "invalidToken" description = "shortdescription" gName = "groupname" @@ -36,7 +36,7 @@ var ( Name: gName, Description: description, Metadata: validGMetadata, - Status: mfclients.EnabledStatus, + Status: clients.EnabledStatus, } withinDuration = 5 * time.Second adminEmail = "admin@example.com" @@ -58,7 +58,6 @@ func newService(tokens map[string]string) (groups.Service, *gmocks.Repository, * } func TestCreateGroup(t *testing.T) { - svc, gRepo, _ := newService(map[string]string{token: adminEmail}) cases := []struct { @@ -81,7 +80,7 @@ func TestCreateGroup(t *testing.T) { group: mfgroups.Group{ Name: gName, Parent: testsutil.GenerateUUID(t, idProvider), - Status: mfclients.EnabledStatus, + Status: clients.EnabledStatus, }, err: nil, }, @@ -128,7 +127,6 @@ func TestCreateGroup(t *testing.T) { } func TestUpdateGroup(t *testing.T) { - svc, gRepo, pRepo := newService(map[string]string{token: adminEmail}) cases := []struct { @@ -168,13 +166,13 @@ func TestUpdateGroup(t *testing.T) { desc: "update group metadata", group: mfgroups.Group{ ID: group.ID, - Metadata: mfclients.Metadata{ + Metadata: clients.Metadata{ "field": "value2", }, }, response: mfgroups.Group{ ID: group.ID, - Metadata: mfclients.Metadata{ + Metadata: clients.Metadata{ "field": "value2", }, }, @@ -205,7 +203,7 @@ func TestUpdateGroup(t *testing.T) { desc: "update group metadata with invalid group id", group: mfgroups.Group{ ID: mocks.WrongID, - Metadata: mfclients.Metadata{ + Metadata: clients.Metadata{ "field": "value2", }, }, @@ -237,7 +235,7 @@ func TestUpdateGroup(t *testing.T) { desc: "update group metadata with invalid token", group: mfgroups.Group{ ID: group.ID, - Metadata: mfclients.Metadata{ + Metadata: clients.Metadata{ "field": "value2", }, }, @@ -258,11 +256,9 @@ func TestUpdateGroup(t *testing.T) { repoCall1.Unset() repoCall2.Unset() } - } func TestViewGroup(t *testing.T) { - svc, gRepo, pRepo := newService(map[string]string{token: adminEmail}) cases := []struct { @@ -273,7 +269,6 @@ func TestViewGroup(t *testing.T) { err error }{ { - desc: "view group", token: token, groupID: group.ID, @@ -308,18 +303,17 @@ func TestViewGroup(t *testing.T) { } func TestListGroups(t *testing.T) { - svc, gRepo, pRepo := newService(map[string]string{token: adminEmail}) nGroups := uint64(200) parentID := "" - var aGroups = []mfgroups.Group{} + aGroups := []mfgroups.Group{} for i := uint64(0); i < nGroups; i++ { group := mfgroups.Group{ ID: testsutil.GenerateUUID(t, idProvider), Name: fmt.Sprintf("Group_%d", i), Description: description, - Metadata: mfclients.Metadata{ + Metadata: clients.Metadata{ "field": "value", }, Parent: parentID, @@ -392,13 +386,12 @@ func TestListGroups(t *testing.T) { } func TestEnableGroup(t *testing.T) { - svc, gRepo, pRepo := newService(map[string]string{token: adminEmail}) - enabledGroup1 := mfgroups.Group{ID: ID, Name: "group1", Status: mfclients.EnabledStatus} - disabledGroup := mfgroups.Group{ID: ID, Name: "group2", Status: mfclients.DisabledStatus} + enabledGroup1 := mfgroups.Group{ID: ID, Name: "group1", Status: clients.EnabledStatus} + disabledGroup := mfgroups.Group{ID: ID, Name: "group2", Status: clients.DisabledStatus} disabledGroup1 := disabledGroup - disabledGroup1.Status = mfclients.EnabledStatus + disabledGroup1.Status = clients.EnabledStatus casesEnabled := []struct { desc string @@ -422,7 +415,7 @@ func TestEnableGroup(t *testing.T) { token: token, group: enabledGroup1, response: enabledGroup1, - err: mfclients.ErrStatusAlreadyAssigned, + err: clients.ErrStatusAlreadyAssigned, }, { desc: "enable non-existing group", @@ -447,13 +440,13 @@ func TestEnableGroup(t *testing.T) { casesDisabled := []struct { desc string - status mfclients.Status + status clients.Status size uint64 response mfgroups.GroupsPage }{ { desc: "list activated groups", - status: mfclients.EnabledStatus, + status: clients.EnabledStatus, size: 2, response: mfgroups.GroupsPage{ Page: mfgroups.Page{ @@ -466,7 +459,7 @@ func TestEnableGroup(t *testing.T) { }, { desc: "list deactivated groups", - status: mfclients.DisabledStatus, + status: clients.DisabledStatus, size: 1, response: mfgroups.GroupsPage{ Page: mfgroups.Page{ @@ -479,7 +472,7 @@ func TestEnableGroup(t *testing.T) { }, { desc: "list activated and deactivated groups", - status: mfclients.AllStatus, + status: clients.AllStatus, size: 3, response: mfgroups.GroupsPage{ Page: mfgroups.Page{ @@ -512,13 +505,12 @@ func TestEnableGroup(t *testing.T) { } func TestDisableGroup(t *testing.T) { - svc, gRepo, pRepo := newService(map[string]string{token: adminEmail}) - enabledGroup1 := mfgroups.Group{ID: ID, Name: "group1", Status: mfclients.EnabledStatus} - disabledGroup := mfgroups.Group{ID: ID, Name: "group2", Status: mfclients.DisabledStatus} + enabledGroup1 := mfgroups.Group{ID: ID, Name: "group1", Status: clients.EnabledStatus} + disabledGroup := mfgroups.Group{ID: ID, Name: "group2", Status: clients.DisabledStatus} disabledGroup1 := enabledGroup1 - disabledGroup1.Status = mfclients.DisabledStatus + disabledGroup1.Status = clients.DisabledStatus casesDisabled := []struct { desc string @@ -542,7 +534,7 @@ func TestDisableGroup(t *testing.T) { token: token, group: disabledGroup, response: mfgroups.Group{}, - err: mfclients.ErrStatusAlreadyAssigned, + err: clients.ErrStatusAlreadyAssigned, }, { desc: "disable non-existing group", @@ -567,13 +559,13 @@ func TestDisableGroup(t *testing.T) { casesEnabled := []struct { desc string - status mfclients.Status + status clients.Status size uint64 response mfgroups.GroupsPage }{ { desc: "list activated groups", - status: mfclients.EnabledStatus, + status: clients.EnabledStatus, size: 1, response: mfgroups.GroupsPage{ Page: mfgroups.Page{ @@ -586,7 +578,7 @@ func TestDisableGroup(t *testing.T) { }, { desc: "list deactivated groups", - status: mfclients.DisabledStatus, + status: clients.DisabledStatus, size: 2, response: mfgroups.GroupsPage{ Page: mfgroups.Page{ @@ -599,7 +591,7 @@ func TestDisableGroup(t *testing.T) { }, { desc: "list activated and deactivated groups", - status: mfclients.AllStatus, + status: clients.AllStatus, size: 3, response: mfgroups.GroupsPage{ Page: mfgroups.Page{ @@ -632,16 +624,15 @@ func TestDisableGroup(t *testing.T) { } func TestListMemberships(t *testing.T) { - svc, gRepo, pRepo := newService(map[string]string{token: adminEmail}) - var nGroups = uint64(100) - var aGroups = []mfgroups.Group{} + nGroups := uint64(100) + aGroups := []mfgroups.Group{} owner := testsutil.GenerateUUID(t, idProvider) for i := uint64(1); i < nGroups; i++ { group := mfgroups.Group{ Name: fmt.Sprintf("membership_%d@example.com", i), - Metadata: mfclients.Metadata{"role": "group"}, + Metadata: clients.Metadata{"role": "group"}, } if i%3 == 0 { group.Owner = owner @@ -687,7 +678,7 @@ func TestListMemberships(t *testing.T) { Offset: 6, Total: nGroups, Limit: nGroups, - Status: mfclients.AllStatus, + Status: clients.AllStatus, Subject: adminEmail, OwnerID: adminEmail, Action: "g_list", @@ -749,7 +740,7 @@ func TestListMemberships(t *testing.T) { Offset: 0, Total: nGroups, Limit: nGroups, - Status: mfclients.AllStatus, + Status: clients.AllStatus, Subject: owner, Action: "g_list", }, diff --git a/things/policies/api/http/transport.go b/things/policies/api/http/transport.go index 1c295e006c..800c3a2c86 100644 --- a/things/policies/api/http/transport.go +++ b/things/policies/api/http/transport.go @@ -82,7 +82,6 @@ func MakeHandler(csvc clients.Service, psvc policies.Service, mux *bone.Mux, log ), "bulk_disconnect")) return mux - } func decodeConnectThing(_ context.Context, r *http.Request) (interface{}, error) { diff --git a/things/policies/postgres/policies_test.go b/things/policies/postgres/policies_test.go index 2b5ee44617..6e1cd692f3 100644 --- a/things/policies/postgres/policies_test.go +++ b/things/policies/postgres/policies_test.go @@ -21,9 +21,7 @@ import ( "github.com/stretchr/testify/require" ) -var ( - idProvider = uuid.New() -) +var idProvider = uuid.New() func TestPoliciesSave(t *testing.T) { t.Cleanup(func() { testsutil.CleanUpDB(t, db) }) @@ -349,7 +347,7 @@ func TestPoliciesRetrievalAll(t *testing.T) { crepo := cpostgres.NewRepository(database) grepo := gpostgres.New(database) - var nPolicies = uint64(10) + nPolicies := uint64(10) clientA := mfclients.Client{ ID: testsutil.GenerateUUID(t, idProvider), diff --git a/things/policies/postgres/setup_test.go b/things/policies/postgres/setup_test.go index d6372e3b04..30819c744b 100644 --- a/things/policies/postgres/setup_test.go +++ b/things/policies/postgres/setup_test.go @@ -12,10 +12,10 @@ import ( "time" "github.com/jmoiron/sqlx" - pgClient "github.com/mainflux/mainflux/internal/clients/postgres" + pgclient "github.com/mainflux/mainflux/internal/clients/postgres" "github.com/mainflux/mainflux/internal/postgres" tpostgres "github.com/mainflux/mainflux/things/postgres" - dockertest "github.com/ory/dockertest/v3" + "github.com/ory/dockertest/v3" "github.com/ory/dockertest/v3/docker" "go.opentelemetry.io/otel" ) @@ -64,7 +64,7 @@ func TestMain(m *testing.M) { log.Fatalf("Could not connect to docker: %s", err) } - dbConfig := pgClient.Config{ + dbConfig := pgclient.Config{ Host: "localhost", Port: port, User: "test", @@ -76,7 +76,7 @@ func TestMain(m *testing.M) { SSLRootCert: "", } - if db, err = pgClient.SetupDB(dbConfig, *tpostgres.Migration()); err != nil { + if db, err = pgclient.SetupDB(dbConfig, *tpostgres.Migration()); err != nil { log.Fatalf("Could not setup test DB connection: %s", err) } database = postgres.NewDatabase(db, dbConfig, tracer) diff --git a/things/policies/service_test.go b/things/policies/service_test.go index 21b294195a..5f95533bba 100644 --- a/things/policies/service_test.go +++ b/things/policies/service_test.go @@ -4,8 +4,8 @@ package policies_test import ( - context "context" - fmt "fmt" + "context" + "fmt" "testing" "github.com/mainflux/mainflux/internal/apiutil" @@ -135,7 +135,6 @@ func TestAddPolicy(t *testing.T) { repoCall2.Parent.AssertCalled(t, "Save", context.Background(), mock.Anything) repoCall2.Unset() } - } func TestAuthorize(t *testing.T) { @@ -197,7 +196,6 @@ func TestDeletePolicy(t *testing.T) { } func TestListPolicies(t *testing.T) { - svc, pRepo, _ := newService(map[string]string{token: adminEmail}) id := testsutil.GenerateUUID(t, idProvider) @@ -205,8 +203,8 @@ func TestListPolicies(t *testing.T) { readPolicy := "m_read" writePolicy := "m_write" - var nPolicy = uint64(10) - var aPolicies = []policies.Policy{} + nPolicy := uint64(10) + aPolicies := []policies.Policy{} for i := uint64(0); i < nPolicy; i++ { pr := policies.Policy{ OwnerID: id, @@ -282,11 +280,9 @@ func TestListPolicies(t *testing.T) { assert.Equal(t, tc.response, page, fmt.Sprintf("%s: expected size %v got %v\n", tc.desc, tc.response, page)) repoCall.Unset() } - } func TestUpdatePolicies(t *testing.T) { - svc, pRepo, _ := newService(map[string]string{token: adminEmail}) policy := policies.Policy{Object: "obj1", Actions: []string{"m_read"}, Subject: "sub1"} diff --git a/tools/e2e/cmd/main.go b/tools/e2e/cmd/main.go index 758b748edf..6f3e048e7d 100644 --- a/tools/e2e/cmd/main.go +++ b/tools/e2e/cmd/main.go @@ -17,7 +17,7 @@ const defNum = uint64(10) func main() { econf := e2e.Config{} - var rootCmd = &cobra.Command{ + rootCmd := &cobra.Command{ Use: "e2e", Short: "e2e is end-to-end testing tool for Mainflux", Long: "Tool for testing end-to-end flow of mainflux by doing a couple of operations namely:\n" + diff --git a/tools/e2e/e2e.go b/tools/e2e/e2e.go index 94e8ee4d3c..cbffdb1d1d 100644 --- a/tools/e2e/e2e.go +++ b/tools/e2e/e2e.go @@ -170,7 +170,8 @@ func createUsers(s sdk.SDK, conf Config, token string) ([]sdk.User, error) { Name: fmt.Sprintf("%s-%s", conf.Prefix, namesgenerator.Generate()), Credentials: sdk.Credentials{ Identity: fmt.Sprintf("%s-%s@email.com", conf.Prefix, namesgenerator.Generate()), - Secret: defPass}, + Secret: defPass, + }, Status: sdk.EnabledStatus, } diff --git a/tools/mqtt-bench/cmd/main.go b/tools/mqtt-bench/cmd/main.go index af58da25dd..78a3bacd0b 100644 --- a/tools/mqtt-bench/cmd/main.go +++ b/tools/mqtt-bench/cmd/main.go @@ -17,7 +17,7 @@ func main() { bconf := bench.Config{} // Command - var rootCmd = &cobra.Command{ + rootCmd := &cobra.Command{ Use: "mqtt-bench", Short: "mqtt-bench is MQTT benchmark tool for Mainflux", Long: `Tool for exctensive load and benchmarking of MQTT brokers used within the Mainflux platform. diff --git a/tools/mqtt-bench/results.go b/tools/mqtt-bench/results.go index 5d0d06bcbe..e69f512afa 100644 --- a/tools/mqtt-bench/results.go +++ b/tools/mqtt-bench/results.go @@ -10,8 +10,8 @@ import ( "log" "time" - mat "gonum.org/v1/gonum/mat" - stat "gonum.org/v1/gonum/stat" + "gonum.org/v1/gonum/mat" + "gonum.org/v1/gonum/stat" ) type subsResults map[string](*[]float64) diff --git a/tools/provision/cmd/main.go b/tools/provision/cmd/main.go index 60abdae00e..ffd4d2137a 100644 --- a/tools/provision/cmd/main.go +++ b/tools/provision/cmd/main.go @@ -14,7 +14,7 @@ import ( func main() { pconf := provision.Config{} - var rootCmd = &cobra.Command{ + rootCmd := &cobra.Command{ Use: "provision", Short: "provision is provisioning tool for Mainflux", Long: `Tool for provisioning series of Mainflux channels and things and connecting them together. diff --git a/tools/provision/provision.go b/tools/provision/provision.go index 188509ea22..9d08e59152 100644 --- a/tools/provision/provision.go +++ b/tools/provision/provision.go @@ -85,7 +85,6 @@ func Provision(conf Config) error { // Create new user if _, err := s.CreateUser(user, ""); err != nil { return fmt.Errorf("Unable to create new user: %s", err.Error()) - } var err error diff --git a/twins/api/http/endpoint_states_test.go b/twins/api/http/endpoint_states_test.go index 4f7a2b845f..1662618ee1 100644 --- a/twins/api/http/endpoint_states_test.go +++ b/twins/api/http/endpoint_states_test.go @@ -11,11 +11,10 @@ import ( "testing" "github.com/mainflux/mainflux/twins" + "github.com/mainflux/mainflux/twins/mocks" "github.com/mainflux/senml" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - - "github.com/mainflux/mainflux/twins/mocks" ) const numRecs = 100 @@ -50,7 +49,7 @@ func TestListStates(t *testing.T) { require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err)) attr := def.Attributes[0] - var recs = make([]senml.Record, numRecs) + recs := make([]senml.Record, numRecs) mocks.CreateSenML(recs) message, err := mocks.CreateMessage(attr, recs) require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err)) diff --git a/twins/mongodb/setup_test.go b/twins/mongodb/setup_test.go index 6c444e4439..ba87971ded 100644 --- a/twins/mongodb/setup_test.go +++ b/twins/mongodb/setup_test.go @@ -9,10 +9,9 @@ import ( "os" "testing" + "github.com/ory/dockertest/v3" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" - - dockertest "github.com/ory/dockertest/v3" ) const wrongValue = "wrong-value" diff --git a/twins/redis/setup_test.go b/twins/redis/setup_test.go index dfccdc32df..3ff72597c2 100644 --- a/twins/redis/setup_test.go +++ b/twins/redis/setup_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/go-redis/redis/v8" - dockertest "github.com/ory/dockertest/v3" + "github.com/ory/dockertest/v3" ) var redisClient *redis.Client diff --git a/twins/service.go b/twins/service.go index acec271873..856cb59c32 100644 --- a/twins/service.go +++ b/twins/service.go @@ -10,12 +10,11 @@ import ( "math" "time" + "github.com/mainflux/mainflux" "github.com/mainflux/mainflux/logger" "github.com/mainflux/mainflux/pkg/errors" "github.com/mainflux/mainflux/pkg/messaging" "github.com/mainflux/mainflux/users/policies" - - "github.com/mainflux/mainflux" "github.com/mainflux/senml" ) diff --git a/twins/service_test.go b/twins/service_test.go index 3064b2da74..163872b381 100644 --- a/twins/service_test.go +++ b/twins/service_test.go @@ -176,7 +176,6 @@ func TestListTwins(t *testing.T) { err: nil, }, { - desc: "list with zero limit", token: token, limit: 0, @@ -268,7 +267,7 @@ func TestSaveStates(t *testing.T) { twWildcard, err := svc.AddTwin(context.Background(), token, twin, defWildcard) require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err)) - var recs = make([]senml.Record, numRecs) + recs := make([]senml.Record, numRecs) mocks.CreateSenML(recs) var ttlAdded uint64 @@ -342,7 +341,7 @@ func TestListStates(t *testing.T) { mocks.CreateDefinition(channels[2:3], subtopics[2:3])) require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err)) - var recs = make([]senml.Record, numRecs) + recs := make([]senml.Record, numRecs) mocks.CreateSenML(recs) message, err := mocks.CreateMessage(attr, recs) require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err)) diff --git a/twins/tracing/twins.go b/twins/tracing/twins.go index 16e6107126..8edee2973f 100644 --- a/twins/tracing/twins.go +++ b/twins/tracing/twins.go @@ -126,6 +126,5 @@ func (tcm twinCacheMiddleware) Remove(ctx context.Context, twinID string) error } func createSpan(ctx context.Context, tracer trace.Tracer, opName string) (context.Context, trace.Span) { - return tracer.Start(ctx, opName) } diff --git a/users/clients/api/responses.go b/users/clients/api/responses.go index b9ee0f907b..4df257b5f3 100644 --- a/users/clients/api/responses.go +++ b/users/clients/api/responses.go @@ -189,8 +189,7 @@ func (res passwResetReqRes) Empty() bool { return false } -type passwChangeRes struct { -} +type passwChangeRes struct{} func (res passwChangeRes) Code() int { return http.StatusCreated diff --git a/users/clients/api/transport.go b/users/clients/api/transport.go index ef410df072..4f60461d58 100644 --- a/users/clients/api/transport.go +++ b/users/clients/api/transport.go @@ -350,6 +350,7 @@ func decodeRefreshToken(_ context.Context, r *http.Request) (interface{}, error) return req, nil } + func decodeCreateClientReq(_ context.Context, r *http.Request) (interface{}, error) { if !strings.Contains(r.Header.Get("Content-Type"), api.ContentType) { return nil, errors.Wrap(apiutil.ErrValidation, apiutil.ErrUnsupportedContentType) diff --git a/users/clients/mocks/email.go b/users/clients/mocks/email.go index 10f8149781..a71b8f8254 100644 --- a/users/clients/mocks/email.go +++ b/users/clients/mocks/email.go @@ -7,8 +7,7 @@ import ( "github.com/mainflux/mainflux/users/clients" ) -type emailerMock struct { -} +type emailerMock struct{} // NewEmailer provides emailer instance for the test. func NewEmailer() clients.Emailer { diff --git a/users/clients/postgres/clients.go b/users/clients/postgres/clients.go index 4f0d9b08eb..a65227c149 100644 --- a/users/clients/postgres/clients.go +++ b/users/clients/postgres/clients.go @@ -6,8 +6,6 @@ package postgres import ( "context" - // required for SQL access. - "github.com/mainflux/mainflux/internal/postgres" mfclients "github.com/mainflux/mainflux/pkg/clients" pgclients "github.com/mainflux/mainflux/pkg/clients/postgres" diff --git a/users/clients/postgres/setup_test.go b/users/clients/postgres/setup_test.go index 8e60561bb8..c2b87e9287 100644 --- a/users/clients/postgres/setup_test.go +++ b/users/clients/postgres/setup_test.go @@ -12,10 +12,10 @@ import ( "time" "github.com/jmoiron/sqlx" - pgClient "github.com/mainflux/mainflux/internal/clients/postgres" + pgclient "github.com/mainflux/mainflux/internal/clients/postgres" "github.com/mainflux/mainflux/internal/postgres" upostgres "github.com/mainflux/mainflux/users/postgres" - dockertest "github.com/ory/dockertest/v3" + "github.com/ory/dockertest/v3" "github.com/ory/dockertest/v3/docker" "go.opentelemetry.io/otel" ) @@ -64,7 +64,7 @@ func TestMain(m *testing.M) { log.Fatalf("Could not connect to docker: %s", err) } - dbConfig := pgClient.Config{ + dbConfig := pgclient.Config{ Host: "localhost", Port: port, User: "test", @@ -76,7 +76,7 @@ func TestMain(m *testing.M) { SSLRootCert: "", } - if db, err = pgClient.SetupDB(dbConfig, *upostgres.Migration()); err != nil { + if db, err = pgclient.SetupDB(dbConfig, *upostgres.Migration()); err != nil { log.Fatalf("Could not setup test DB connection: %s", err) } diff --git a/users/clients/service_test.go b/users/clients/service_test.go index ea46ae632f..09b51447ac 100644 --- a/users/clients/service_test.go +++ b/users/clients/service_test.go @@ -4,8 +4,8 @@ package clients_test import ( - context "context" - fmt "fmt" + "context" + "fmt" "regexp" "testing" "time" @@ -328,9 +328,9 @@ func TestListClients(t *testing.T) { e := mocks.NewEmailer() svc := clients.NewService(cRepo, pRepo, tokenizer, e, phasher, idProvider, passRegex) - var nClients = uint64(200) - var aClients = []mfclients.Client{} - var OwnerID = testsutil.GenerateUUID(t, idProvider) + nClients := uint64(200) + aClients := []mfclients.Client{} + OwnerID := testsutil.GenerateUUID(t, idProvider) for i := uint64(1); i < nClients; i++ { identity := fmt.Sprintf("TestListClients_%d@example.com", i) client := mfclients.Client{ @@ -1199,8 +1199,8 @@ func TestListMembers(t *testing.T) { e := mocks.NewEmailer() svc := clients.NewService(cRepo, pRepo, tokenizer, e, phasher, idProvider, passRegex) - var nClients = uint64(10) - var aClients = []mfclients.Client{} + nClients := uint64(10) + aClients := []mfclients.Client{} owner := testsutil.GenerateUUID(t, idProvider) for i := uint64(0); i < nClients; i++ { identity := fmt.Sprintf("member_%d@example.com", i) diff --git a/users/clients/tracing/tracing.go b/users/clients/tracing/tracing.go index 894a375677..2da361962d 100644 --- a/users/clients/tracing/tracing.go +++ b/users/clients/tracing/tracing.go @@ -177,7 +177,6 @@ func (tm *tracingMiddleware) ListMembers(ctx context.Context, token, groupID str defer span.End() return tm.svc.ListMembers(ctx, token, groupID, pm) - } // Identify traces the "Identify" operation of the wrapped clients.Service. diff --git a/users/groups/api/endpoints.go b/users/groups/api/endpoints.go index 27dc9926dd..c09b75d77a 100644 --- a/users/groups/api/endpoints.go +++ b/users/groups/api/endpoints.go @@ -175,7 +175,6 @@ func buildGroupsResponseTree(page mfgroups.GroupsPage) groupPageRes { if children, ok := parentsMap[group.ID]; ok { group.Children = children } - } for _, group := range groupsMap { diff --git a/users/groups/api/transport.go b/users/groups/api/transport.go index 0cfd2d977e..95df365063 100644 --- a/users/groups/api/transport.go +++ b/users/groups/api/transport.go @@ -151,7 +151,6 @@ func decodeListMembershipRequest(_ context.Context, r *http.Request) (interface{ }, } return req, nil - } func decodeListGroupsRequest(_ context.Context, r *http.Request) (interface{}, error) { diff --git a/users/groups/service_test.go b/users/groups/service_test.go index 357208e807..0fbd8ee725 100644 --- a/users/groups/service_test.go +++ b/users/groups/service_test.go @@ -4,8 +4,8 @@ package groups_test import ( - context "context" - fmt "fmt" + "context" + "fmt" "regexp" "testing" "time" @@ -266,7 +266,6 @@ func TestUpdateGroup(t *testing.T) { repoCall.Unset() repoCall1.Unset() } - } func TestViewGroup(t *testing.T) { @@ -288,7 +287,6 @@ func TestViewGroup(t *testing.T) { err error }{ { - desc: "view group", token: testsutil.GenerateValidToken(t, testsutil.GenerateUUID(t, idProvider), csvc, cRepo, phasher), groupID: group.ID, @@ -339,7 +337,7 @@ func TestListGroups(t *testing.T) { nGroups := uint64(200) parentID := "" - var aGroups = []mfgroups.Group{} + aGroups := []mfgroups.Group{} for i := uint64(0); i < nGroups; i++ { group := mfgroups.Group{ ID: testsutil.GenerateUUID(t, idProvider), @@ -419,7 +417,6 @@ func TestListGroups(t *testing.T) { repoCall.Unset() repoCall1.Unset() } - } func TestEnableGroup(t *testing.T) { @@ -693,8 +690,8 @@ func TestListMemberships(t *testing.T) { csvc := clients.NewService(cRepo, pRepo, tokenizer, e, phasher, idProvider, passRegex) svc := groups.NewService(gRepo, pRepo, tokenizer, idProvider) - var nGroups = uint64(100) - var aGroups = []mfgroups.Group{} + nGroups := uint64(100) + aGroups := []mfgroups.Group{} owner := testsutil.GenerateUUID(t, idProvider) for i := uint64(1); i < nGroups; i++ { group := mfgroups.Group{ diff --git a/users/policies/policies.go b/users/policies/policies.go index f550380c38..5d59aad775 100644 --- a/users/policies/policies.go +++ b/users/policies/policies.go @@ -164,7 +164,6 @@ func ValidateAction(act string) bool { } } return false - } // AddListAction adds list actions to the actions slice if c_ or g_ actions are present. diff --git a/users/policies/postgres/policies_test.go b/users/policies/postgres/policies_test.go index 056a1752e1..97b88cc9d2 100644 --- a/users/policies/postgres/policies_test.go +++ b/users/policies/postgres/policies_test.go @@ -21,9 +21,7 @@ import ( "github.com/stretchr/testify/require" ) -var ( - idProvider = uuid.New() -) +var idProvider = uuid.New() func TestPoliciesSave(t *testing.T) { t.Cleanup(func() { testsutil.CleanUpDB(t, db) }) @@ -354,7 +352,7 @@ func TestPoliciesRetrievalAll(t *testing.T) { crepo := cpostgres.NewRepository(database) grepo := gpostgres.New(database) - var nPolicies = uint64(10) + nPolicies := uint64(10) clientA := mfclients.Client{ ID: testsutil.GenerateUUID(t, idProvider), diff --git a/users/policies/postgres/setup_test.go b/users/policies/postgres/setup_test.go index b03a6784b5..df73394c0f 100644 --- a/users/policies/postgres/setup_test.go +++ b/users/policies/postgres/setup_test.go @@ -14,10 +14,10 @@ import ( "time" "github.com/jmoiron/sqlx" - pgClient "github.com/mainflux/mainflux/internal/clients/postgres" + pgclient "github.com/mainflux/mainflux/internal/clients/postgres" "github.com/mainflux/mainflux/internal/postgres" upostgres "github.com/mainflux/mainflux/users/postgres" - dockertest "github.com/ory/dockertest/v3" + "github.com/ory/dockertest/v3" "github.com/ory/dockertest/v3/docker" "go.opentelemetry.io/otel" ) @@ -66,7 +66,7 @@ func TestMain(m *testing.M) { log.Fatalf("Could not connect to docker: %s", err) } - dbConfig := pgClient.Config{ + dbConfig := pgclient.Config{ Host: "localhost", Port: port, User: "test", @@ -78,7 +78,7 @@ func TestMain(m *testing.M) { SSLRootCert: "", } - if db, err = pgClient.SetupDB(dbConfig, *upostgres.Migration()); err != nil { + if db, err = pgclient.SetupDB(dbConfig, *upostgres.Migration()); err != nil { log.Fatalf("Could not setup test DB connection: %s", err) } diff --git a/users/policies/service_test.go b/users/policies/service_test.go index 2912984773..dac190b9e8 100644 --- a/users/policies/service_test.go +++ b/users/policies/service_test.go @@ -4,8 +4,8 @@ package policies_test import ( - context "context" - fmt "fmt" + "context" + "fmt" "regexp" "testing" "time" @@ -181,7 +181,6 @@ func TestAddPolicy(t *testing.T) { repoCall2.Unset() repoCall3.Unset() } - } func TestAuthorize(t *testing.T) { @@ -257,7 +256,6 @@ func TestAuthorize(t *testing.T) { repoCall.Unset() repoCall1.Unset() } - } func TestDeletePolicy(t *testing.T) { @@ -293,8 +291,8 @@ func TestListPolicies(t *testing.T) { readPolicy := "m_read" writePolicy := "m_write" - var nPolicy = uint64(10) - var aPolicies = []policies.Policy{} + nPolicy := uint64(10) + aPolicies := []policies.Policy{} for i := uint64(0); i < nPolicy; i++ { pr := policies.Policy{ OwnerID: id, @@ -376,7 +374,6 @@ func TestListPolicies(t *testing.T) { repoCall1.Unset() repoCall.Unset() } - } func TestUpdatePolicies(t *testing.T) { diff --git a/users/policies/tracing/tracing.go b/users/policies/tracing/tracing.go index ccc0b24c47..cf571b218e 100644 --- a/users/policies/tracing/tracing.go +++ b/users/policies/tracing/tracing.go @@ -46,7 +46,6 @@ func (tm *tracingMiddleware) UpdatePolicy(ctx context.Context, token string, p p defer span.End() return tm.psvc.UpdatePolicy(ctx, token, p) - } // AddPolicy traces the "AddPolicy" operation of the wrapped policies.Service. @@ -59,7 +58,6 @@ func (tm *tracingMiddleware) AddPolicy(ctx context.Context, token string, p poli defer span.End() return tm.psvc.AddPolicy(ctx, token, p) - } // DeletePolicy traces the "DeletePolicy" operation of the wrapped policies.Service. @@ -68,7 +66,6 @@ func (tm *tracingMiddleware) DeletePolicy(ctx context.Context, token string, p p defer span.End() return tm.psvc.DeletePolicy(ctx, token, p) - } // ListPolicies traces the "ListPolicies" operation of the wrapped policies.Service. @@ -81,5 +78,4 @@ func (tm *tracingMiddleware) ListPolicies(ctx context.Context, token string, pm defer span.End() return tm.psvc.ListPolicies(ctx, token, pm) - } diff --git a/ws/api/endpoint_test.go b/ws/api/endpoint_test.go index ac7656a186..9bed0ec4e0 100644 --- a/ws/api/endpoint_test.go +++ b/ws/api/endpoint_test.go @@ -11,12 +11,10 @@ import ( "testing" "github.com/gorilla/websocket" - + httpmock "github.com/mainflux/mainflux/http/mocks" mflog "github.com/mainflux/mainflux/logger" "github.com/mainflux/mainflux/things/policies" "github.com/mainflux/mainflux/ws" - - httpmock "github.com/mainflux/mainflux/http/mocks" "github.com/mainflux/mainflux/ws/api" "github.com/mainflux/mainflux/ws/mocks" "github.com/stretchr/testify/assert" diff --git a/ws/client_test.go b/ws/client_test.go index 3b30cd8a9e..60fd58f2fa 100644 --- a/ws/client_test.go +++ b/ws/client_test.go @@ -46,6 +46,7 @@ func handler(w http.ResponseWriter, r *http.Request) { msgChan <- message } } + func TestHandle(t *testing.T) { s := httptest.NewServer(http.HandlerFunc(handler)) defer s.Close() diff --git a/ws/mocks/pubsub.go b/ws/mocks/pubsub.go index ab74a69054..b058f9a7c8 100644 --- a/ws/mocks/pubsub.go +++ b/ws/mocks/pubsub.go @@ -43,6 +43,7 @@ type mockPubSub struct { func NewPubSub() MockPubSub { return &mockPubSub{false, nil} } + func (pubsub *mockPubSub) Publish(ctx context.Context, s string, msg *messaging.Message) error { if pubsub.conn != nil { data, err := json.Marshal(msg)