NOISSUE - Change import name aliases (absmach#1868)

* Change import name aliases Signed-off-by: WashingtonKK <[email protected]> * Change import name aliases Signed-off-by: WashingtonKK <[email protected]> * Change import aliases Signed-off-by: WashingtonKK <[email protected]> * Remove unused aliases Signed-off-by: WashingtonKK <[email protected]> Fix aliases Signed-off-by: WashingtonKK <[email protected]> FIx errors Signed-off-by: WashingtonKK <[email protected]> Fix error Signed-off-by: WashingtonKK <[email protected]> FIx merge Signed-off-by: WashingtonKK <[email protected]> FIx merge Signed-off-by: WashingtonKK <[email protected]> FIx merge Signed-off-by: WashingtonKK <[email protected]> * Fix import alias Signed-off-by: WashingtonKK <[email protected]> * Fix errors Signed-off-by: WashingtonKK <[email protected]> * Fix linter Signed-off-by: WashingtonKK <[email protected]> * Fix linter Signed-off-by: WashingtonKK <[email protected]> * Fix import Signed-off-by: WashingtonKK <[email protected]> * Add linter to CI pipeline Signed-off-by: WashingtonKK <[email protected]> * Changes Signed-off-by: WashingtonKK <[email protected]> * Remove unused aliases Signed-off-by: WashingtonKK <[email protected]> * Fix merge issues Signed-off-by: WashingtonKK <[email protected]> * Fix gci Signed-off-by: WashingtonKK <[email protected]> * Fix gci Signed-off-by: WashingtonKK <[email protected]> * Fix gci Signed-off-by: WashingtonKK <[email protected]> * Add gofumpt Signed-off-by: WashingtonKK <[email protected]> * Remove multiple gofupmt in CI Signed-off-by: WashingtonKK <[email protected]> * Remove unnecessary changes Signed-off-by: WashingtonKK <[email protected]> * Fix linter Signed-off-by: WashingtonKK <[email protected]> * Fix CI pipeline Signed-off-by: WashingtonKK <[email protected]> --------- Signed-off-by: WashingtonKK <[email protected]>
AryanGodara · Aug 11, 2023 · e2992cb · e2992cb
1 parent 91e3873
commit e2992cb
Show file tree

Hide file tree

Showing 178 changed files with 617 additions and 719 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -125,7 +125,6 @@ var cmdBootstrap = []cobra.Command{
 				return
 			}
 			logUsage(cmd.Use)
-
 		},
 	},
 	{

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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))
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
     	return c, nil
     }
     func (crm *configRepositoryMock) RetrieveAll(_ context.Context, token string, filter bootstrap.Filter, offset, limit uint64) bootstrap.ConfigsPage {
@@ Expand Down @@