NOISSUE - Change import name aliases #1868

WashingtonKK · 2023-07-23T19:35:36Z

Pull request title should be MF-XXX - description or NOISSUE - description where XXX is ID of issue that this PR relate to.
Please review the CONTRIBUTING.md file for detailed contributing guidelines.

What does this do?

Currently, in main.go files we have Go package import aliases that are not according to Go recommended practices. This PR changes the aliases of the imports to correspond to go's recommended practices.

Which issue(s) does this PR fix/relate to?

No issue

List any changes that modify/break current functionality

N/A

Have you included tests for your changes?

N/A

Did you document any new/modified functionality?

Notes

codecov · 2023-07-23T19:50:16Z

Codecov Report

Merging #1868 (1ed110c) into master (91e3873) will not change coverage.
The diff coverage is 69.23%.

@@           Coverage Diff           @@
##           master    #1868   +/-   ##
=======================================
  Coverage   67.16%   67.16%           
=======================================
  Files         118      118           
  Lines        9076     9076           
=======================================
  Hits         6096     6096           
  Misses       2351     2351           
  Partials      629      629

Files Changed	Coverage Δ
consumers/notifiers/api/responses.go	`100.00% <ø> (ø)`
consumers/notifiers/api/transport.go	`91.75% <ø> (ø)`
consumers/notifiers/postgres/subscriptions.go	`81.39% <ø> (ø)`
consumers/notifiers/service.go	`60.00% <ø> (ø)`
consumers/writers/influxdb/consumer.go	`89.87% <ø> (ø)`
consumers/writers/mongodb/consumer.go	`79.31% <ø> (ø)`
http/api/transport.go	`71.55% <ø> (ø)`
mqtt/forwarder.go	`0.00% <ø> (ø)`
pkg/errors/sdk_errors.go	`0.00% <ø> (ø)`
pkg/groups/postgres/groups.go	`68.81% <ø> (ø)`
... and 17 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

SammyOina

Check for instances where an alias is used but not required and rebase branch to sync with master

rodneyosodo

also change in other services for example bootstrap/postgres/setup_test.go

cmd/influxdb-writer/main.go

ianmuchyri · 2023-07-24T13:29:20Z

cmd/postgres-writer/main.go

@@ -16,10 +16,10 @@ import (
 	"github.com/mainflux/mainflux/consumers"
 	consumerTracing "github.com/mainflux/mainflux/consumers/tracing"


consumertracing

rodneyosodo · 2023-07-24T19:55:53Z

Check for instances where an alias is used but not required and rebase branch to sync with master

Did you check this? For example in bootstrap/postgres/setup_test.go you don't need dockertest "github.com/ory/dockertest/v3" as the package name is dockertest also in cli/utils.go

cmd/influxdb-reader/main.go - influxdb2

rodneyosodo

Fix

cmd/lora/main.go redis
consumerTracing

arvindh123

In the following file pgClient is used, Please change them too
users/groups/postgres/setup_test.go
users/policies/postgres/setup_test.go

WashingtonKK · 2023-07-25T18:51:13Z

@arvindh123 , I have addressed the commenrts

drasko

LGTM

rodneyosodo

Fix https://github.com/WashingtonKK/mainflux/blob/639cf561d0836b3fd3deefb1480717e5f10c1eac/cmd/cassandra-writer/main.go#L18 . This applies to all writers main.go files

Also there are some places we don't need import alias for example https://github.com/WashingtonKK/mainflux/blob/639cf561d0836b3fd3deefb1480717e5f10c1eac/consumers/notifiers/api/endpoint.go#L10

rodneyosodo

enabled --enable goimports --enable gci on golangcilint

drasko

LGTM

ianmuchyri · 2023-07-27T07:33:45Z

cmd/lora/main.go

@@ -11,7 +11,7 @@ import (
 	"os"
 	"time"

-	mqttPaho "github.com/eclipse/paho.mqtt.golang"
+	mqttpaho "github.com/eclipse/paho.mqtt.golang"
 	r "github.com/go-redis/redis/v8"


the alias "r" is very vague

same case in cmd/opcua/main.go

ianmuchyri · 2023-07-27T07:38:34Z

Check this in users/main.go https://github.com/mainflux/mainflux/blob/2b78902e01709e4eaac0ae9a1e61e6bfafcb38f7/cmd/users/main.go#L48C1-L48C1

ianmuchyri · 2023-07-27T07:41:28Z

https://github.com/mainflux/mainflux/blob/2b78902e01709e4eaac0ae9a1e61e6bfafcb38f7/consumers/writers/cassandra/consumer_test.go#L14

ianmuchyri · 2023-07-27T07:50:45Z

Is the underscore in these necessary: https://github.com/mainflux/mainflux/blob/2b78902e01709e4eaac0ae9a1e61e6bfafcb38f7/pkg/messaging/mqtt/pubsub_test.go#L15 https://github.com/mainflux/mainflux/blob/2b78902e01709e4eaac0ae9a1e61e6bfafcb38f7/pkg/messaging/mqtt/setup_test.go#L18

ianmuchyri · 2023-07-27T08:05:44Z

Remove unnecessary aliases: https://github.com/mainflux/mainflux/blob/2b78902e01709e4eaac0ae9a1e61e6bfafcb38f7/users/groups/service_test.go#L7C1-L8C11

SammyOina

check for other instances where an alias is used but not required

SammyOina · 2023-07-27T12:02:39Z

bootstrap/postgres/setup_test.go

+	bootstraprepo "github.com/mainflux/mainflux/bootstrap/postgres"
+	pgclient "github.com/mainflux/mainflux/internal/clients/postgres"


only one of these requires an alias, see other instances in other files where an alias is used but not required

SammyOina · 2023-07-27T12:03:21Z

certs/postgres/setup_test.go

@@ -10,7 +10,7 @@ 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"


doesn't require an alias

It does, we have:
"github.com/mainflux/mainflux/certs/postgres"
and
pgClient "github.com/mainflux/mainflux/internal/clients/postgres"

SammyOina · 2023-07-27T12:06:25Z

cmd/bootstrap/main.go

+	authclient "github.com/mainflux/mainflux/internal/clients/grpc/auth"
+	jaegerclient "github.com/mainflux/mainflux/internal/clients/jaeger"


are these aliases required

SammyOina · 2023-07-27T12:06:37Z

cmd/bootstrap/main.go

+	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"


same for this

pgclient and redis client are needed

rodneyosodo · 2023-07-28T13:10:50Z

bootstrap/postgres/setup_test.go

-	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"


dockertest "github.com/ory/dockertest/v3"

This is not needed as the package is dockertest. This applies to all occurrences

Signed-off-by: WashingtonKK <washingtonkigan@gmail.com>

Signed-off-by: WashingtonKK <washingtonkigan@gmail.com> Fix aliases Signed-off-by: WashingtonKK <washingtonkigan@gmail.com> FIx errors Signed-off-by: WashingtonKK <washingtonkigan@gmail.com> Fix error Signed-off-by: WashingtonKK <washingtonkigan@gmail.com> FIx merge Signed-off-by: WashingtonKK <washingtonkigan@gmail.com> FIx merge Signed-off-by: WashingtonKK <washingtonkigan@gmail.com> FIx merge Signed-off-by: WashingtonKK <washingtonkigan@gmail.com>

Signed-off-by: WashingtonKK <washingtonkigan@gmail.com>

.semaphore/semaphore.yml

mqtt/handler.go

scripts/ci.sh

Signed-off-by: WashingtonKK <washingtonkigan@gmail.com>

.semaphore/semaphore.yml

Signed-off-by: WashingtonKK <washingtonkigan@gmail.com>

drasko

LGTM

WashingtonKK requested a review from a team as a code owner July 23, 2023 19:35

SammyOina reviewed Jul 24, 2023

View reviewed changes

rodneyosodo requested changes Jul 24, 2023

View reviewed changes

ianmuchyri reviewed Jul 24, 2023

View reviewed changes

cmd/influxdb-writer/main.go Show resolved Hide resolved

ianmuchyri reviewed Jul 24, 2023

View reviewed changes

WashingtonKK force-pushed the 257-change-import-aliases-naming branch 2 times, most recently from 03956f4 to 52c09af Compare July 24, 2023 17:15

rodneyosodo requested changes Jul 24, 2023

View reviewed changes

arvindh123 requested changes Jul 25, 2023

View reviewed changes

drasko previously approved these changes Jul 25, 2023

View reviewed changes

rodneyosodo requested changes Jul 26, 2023

View reviewed changes

mteodor previously approved these changes Jul 26, 2023

View reviewed changes

WashingtonKK dismissed stale reviews from mteodor and drasko via 2455b5e July 26, 2023 19:21

drasko previously approved these changes Jul 26, 2023

View reviewed changes

ianmuchyri reviewed Jul 27, 2023

View reviewed changes

WashingtonKK dismissed drasko’s stale review via 18c7f1b July 27, 2023 10:46

SammyOina requested changes Jul 27, 2023

View reviewed changes

rodneyosodo requested changes Jul 28, 2023

View reviewed changes

WashingtonKK force-pushed the 257-change-import-aliases-naming branch 3 times, most recently from a26f461 to f0d9597 Compare July 28, 2023 14:14

WashingtonKK force-pushed the 257-change-import-aliases-naming branch 2 times, most recently from 978293f to 6a45d30 Compare August 10, 2023 19:18

WashingtonKK added 15 commits August 10, 2023 22:37

Change import name aliases

06bfc38

Signed-off-by: WashingtonKK <washingtonkigan@gmail.com>

Change import name aliases

77fcdee

Signed-off-by: WashingtonKK <washingtonkigan@gmail.com>

Change import aliases

b634809

Signed-off-by: WashingtonKK <washingtonkigan@gmail.com>

Fix import alias

2eb6df1

Signed-off-by: WashingtonKK <washingtonkigan@gmail.com>

Fix errors

b979b2f

Signed-off-by: WashingtonKK <washingtonkigan@gmail.com>

Fix linter

460443f

Signed-off-by: WashingtonKK <washingtonkigan@gmail.com>

Fix linter

118533e

Signed-off-by: WashingtonKK <washingtonkigan@gmail.com>

Fix import

db67765

Signed-off-by: WashingtonKK <washingtonkigan@gmail.com>

Add linter to CI pipeline

42a75a1

Signed-off-by: WashingtonKK <washingtonkigan@gmail.com>

Changes

43372e6

Signed-off-by: WashingtonKK <washingtonkigan@gmail.com>

Remove unused aliases

cc7418c

Signed-off-by: WashingtonKK <washingtonkigan@gmail.com>

Fix merge issues

ec2dbb3

Signed-off-by: WashingtonKK <washingtonkigan@gmail.com>

Fix gci

2de93ba

Signed-off-by: WashingtonKK <washingtonkigan@gmail.com>

Fix gci

c80875c

Signed-off-by: WashingtonKK <washingtonkigan@gmail.com>

WashingtonKK force-pushed the 257-change-import-aliases-naming branch from 9ee3fde to c80875c Compare August 10, 2023 19:47

WashingtonKK added 3 commits August 10, 2023 22:52

Fix gci

f1f72f0

Signed-off-by: WashingtonKK <washingtonkigan@gmail.com>

Add gofumpt

f03168e

Signed-off-by: WashingtonKK <washingtonkigan@gmail.com>

Remove multiple gofupmt in CI

b35f0b0

Signed-off-by: WashingtonKK <washingtonkigan@gmail.com>

dborovcanin requested changes Aug 10, 2023

View reviewed changes

.semaphore/semaphore.yml Outdated Show resolved Hide resolved

mqtt/handler.go Outdated Show resolved Hide resolved

scripts/ci.sh Outdated Show resolved Hide resolved

WashingtonKK added 2 commits August 11, 2023 06:31

Remove unnecessary changes

7c4bc68

Signed-off-by: WashingtonKK <washingtonkigan@gmail.com>

Fix linter

271934c

Signed-off-by: WashingtonKK <washingtonkigan@gmail.com>

dborovcanin requested changes Aug 11, 2023

View reviewed changes

.semaphore/semaphore.yml Outdated Show resolved Hide resolved

Fix CI pipeline

1ed110c

Signed-off-by: WashingtonKK <washingtonkigan@gmail.com>

dborovcanin approved these changes Aug 11, 2023

View reviewed changes

drasko approved these changes Aug 11, 2023

View reviewed changes

drasko merged commit e2992cb into absmach:master Aug 11, 2023
4 checks passed

WashingtonKK deleted the 257-change-import-aliases-naming branch October 21, 2023 06:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

NOISSUE - Change import name aliases #1868

NOISSUE - Change import name aliases #1868

WashingtonKK commented Jul 23, 2023

codecov bot commented Jul 23, 2023 •

edited

Loading

SammyOina left a comment

rodneyosodo left a comment

ianmuchyri Jul 24, 2023

WashingtonKK Jul 24, 2023

rodneyosodo commented Jul 24, 2023 •

edited

Loading

rodneyosodo left a comment •

edited

Loading

arvindh123 left a comment

WashingtonKK commented Jul 25, 2023

drasko left a comment

rodneyosodo left a comment

rodneyosodo left a comment

drasko left a comment

ianmuchyri Jul 27, 2023

ianmuchyri Jul 27, 2023

ianmuchyri commented Jul 27, 2023 •

edited

Loading

ianmuchyri commented Jul 27, 2023

ianmuchyri commented Jul 27, 2023

ianmuchyri commented Jul 27, 2023 •

edited

Loading

SammyOina left a comment

SammyOina Jul 27, 2023

SammyOina Jul 27, 2023

WashingtonKK Jul 27, 2023

SammyOina Jul 27, 2023

SammyOina Jul 27, 2023

WashingtonKK Jul 27, 2023

rodneyosodo Jul 28, 2023

drasko left a comment

		@@ -16,10 +16,10 @@ import (
		"github.com/mainflux/mainflux/consumers"
		consumerTracing "github.com/mainflux/mainflux/consumers/tracing"

		bootstraprepo "github.com/mainflux/mainflux/bootstrap/postgres"
		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"

NOISSUE - Change import name aliases #1868

NOISSUE - Change import name aliases #1868

Conversation

WashingtonKK commented Jul 23, 2023

What does this do?

Which issue(s) does this PR fix/relate to?

List any changes that modify/break current functionality

Have you included tests for your changes?

Did you document any new/modified functionality?

Notes

codecov bot commented Jul 23, 2023 • edited Loading

Codecov Report

SammyOina left a comment

Choose a reason for hiding this comment

rodneyosodo left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rodneyosodo commented Jul 24, 2023 • edited Loading

rodneyosodo left a comment • edited Loading

Choose a reason for hiding this comment

arvindh123 left a comment

Choose a reason for hiding this comment

WashingtonKK commented Jul 25, 2023

drasko left a comment

Choose a reason for hiding this comment

rodneyosodo left a comment

Choose a reason for hiding this comment

rodneyosodo left a comment

Choose a reason for hiding this comment

drasko left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ianmuchyri commented Jul 27, 2023 • edited Loading

ianmuchyri commented Jul 27, 2023

ianmuchyri commented Jul 27, 2023

ianmuchyri commented Jul 27, 2023 • edited Loading

SammyOina left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

drasko left a comment

Choose a reason for hiding this comment

codecov bot commented Jul 23, 2023 •

edited

Loading

rodneyosodo commented Jul 24, 2023 •

edited

Loading

rodneyosodo left a comment •

edited

Loading

ianmuchyri commented Jul 27, 2023 •

edited

Loading

ianmuchyri commented Jul 27, 2023 •

edited

Loading