MF-1096 - Fix AuthN and Things Auth ENVARS #1066

manuio · 2020-03-09T08:29:03Z

Signed-off-by: Manuel Imperiale manuel.imperiale@gmail.com

Replace MF_AUTHN_URL, MF_AUTH_URL and MF_USERS_URL by MF_AUTHN_GRPC_URL.
Replace MF_THINGS_URL by MF_THINGS_AUTH_GRPC_URL.
Fix MF_THINGS_AUTH_GRPC_URL default values.
Fix README and docker-compose.yml

Resolves #921
Resolves #1041
Resolves #1089
Resolves #1096

cmd/users/main.go

cmd/postgres-reader/main.go

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

codecov-io · 2020-03-09T09:10:05Z

Codecov Report

Merging #1066 into master will not change coverage by %.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #1066   +/-   ##
=======================================
  Coverage   77.13%   77.13%           
=======================================
  Files          95       95           
  Lines        6769     6769           
=======================================
  Hits         5221     5221           
  Misses       1211     1211           
  Partials      337      337

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update baf680c...baf680c. Read the comment docs.

drasko

LGTM

drasko · 2020-03-21T11:37:13Z

@manuio is this still WIP? Can it be reviewed and merged?

manuio · 2020-03-21T14:35:35Z

@drasko We want to merge this one after the next release to avoid issues with the config

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

drasko

If this one does not break us, nothing will ;)

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

drasko

LGTM

.env

env.go

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

http/README.md

drasko · 2020-04-04T02:18:00Z

http/README.md

@@ -31,15 +31,15 @@ services:
    image: mainflux/http:[version]
    container_name: [instance name]
    ports:
-      - [host machine port]:8180
+      - [host machine port]:8185


ws/README.md

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

things/README.md

writers/mongodb/README.md

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

things/README.md

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

cmd/cassandra-reader/main.go

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

dborovcanin · 2020-04-07T08:34:34Z

cmd/cassandra-reader/main.go

+		Username: mainflux.Env(envDBUser, defDBUser),
+		Password: mainflux.Env(envDBPass, defDBPass),


Maybe we should use user and pass here.

We can't because it comes from here: "github.com/influxdata/influxdb/client/v2"

This is Cassandra config from readers/cassandra/init.go.

dborovcanin · 2020-04-07T08:38:29Z

cmd/mongodb-reader/main.go

+
+	envLogLevel          = "MF_MONGO_READER_LOG_LEVEL"
+	envPort              = "MF_MONGO_READER_PORT"
+	envDBName            = "MF_MONGO_READER_DB_NAME"


If we're going to use DB instead of DB_NAME for database names, this should be applied to all the services, including all the readers and writers. Both DB and DB_NAME are OK, as long as we're consistent.

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

drasko

LGTM

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

dborovcanin · 2020-04-07T09:28:48Z

.env

 MF_INFLUX_READER_DB_PORT=8086
 MF_INFLUX_READER_DB_USER=mainflux
 MF_INFLUX_READER_DB_PASS=mainflux
+MF_INFLUX_READER_DB_NAME=mainflux


dborovcanin · 2020-04-07T09:29:19Z

.env

 MF_INFLUX_WRITER_DB_USER=mainflux
 MF_INFLUX_WRITER_DB_PASS=mainflux
+MF_INFLUX_WRITER_DB_NAME=mainflux


Should this be DB?

dborovcanin · 2020-04-07T09:31:50Z

cmd/cassandra-reader/main.go

+		Username: mainflux.Env(envDBUser, defDBUser),
+		Password: mainflux.Env(envDBPass, defDBPass),


This is Cassandra config from readers/cassandra/init.go.

drasko

LGTM

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

drasko

LGTM

* NOISSUE - Fix AuthN and Things Auth ENVARS Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Add DB envars to env.go Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Fix envars Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Add DefLogLLevelError Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Fix DB names Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Fix DB names Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Fix DB names and HTTP ports Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Fix .env Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Revert writers DB names Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Rm unused Twins envars Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Fix reviews Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Fix reviews Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Fix typo Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Remove definitions from env.go Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Revert HTTP gRPC ports Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Use default NATS URL as string Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Fix reviews Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Revert default ports Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Fix typo Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Fix cassandra ENVARS Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Fix cassandra reader ENVARS Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Fix readers and writers envars Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Fix readers and writers .env Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Fix reviews Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

manuio requested a review from a team as a code owner March 9, 2020 08:29

golangcibot reviewed Mar 9, 2020

View reviewed changes

NOISSUE - Fix AuthN and Things Auth ENVARS

3568a39

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

Merge branch 'master' into envs

a99e8c9

drasko previously approved these changes Mar 9, 2020

View reviewed changes

manuio added the work-in-progress label Mar 9, 2020

Fix conflicts

9d18638

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

manuio removed the work-in-progress label Mar 28, 2020

manuio dismissed drasko’s stale review via 9d18638 March 28, 2020 19:45

manuio added 3 commits March 28, 2020 21:15

Add DB envars to env.go

ada6233

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

Fix envars

a6b1c9a

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

Add DefLogLLevelError

499584f

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

drasko previously approved these changes Mar 30, 2020

View reviewed changes

jonathandreyer mentioned this pull request Apr 1, 2020

Duplicate variable in entrypoint of nginx? #1089

Closed

Fix conflicts

0240e34

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

manuio dismissed drasko’s stale review via 0240e34 April 2, 2020 10:25

manuio added 6 commits April 2, 2020 12:39

Fix DB names

cbfc90f

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

Fix DB names

2d4a4bc

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

Fix DB names and HTTP ports

92e797a

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

Fix .env

be46439

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

Revert writers DB names

3a0b8ba

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

Rm unused Twins envars

71b615f

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

drasko previously approved these changes Apr 3, 2020

View reviewed changes

manuio changed the title ~~NOISSUE - Fix AuthN and Things Auth ENVARS~~ MF-1096 - Fix AuthN and Things Auth ENVARS Apr 3, 2020

dborovcanin requested changes Apr 3, 2020

View reviewed changes

.env Outdated Show resolved Hide resolved

env.go Outdated Show resolved Hide resolved

mteodor previously approved these changes Apr 3, 2020

View reviewed changes

Fix reviews

9934f3e

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

drasko requested changes Apr 4, 2020

View reviewed changes

Fix reviews

5711b67

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

drasko requested changes Apr 4, 2020

View reviewed changes

things/README.md Show resolved Hide resolved

things/README.md Outdated Show resolved Hide resolved

writers/mongodb/README.md Outdated Show resolved Hide resolved

Revert default ports

9bf02bb

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

drasko requested changes Apr 4, 2020

View reviewed changes

things/README.md Outdated Show resolved Hide resolved

manuio and others added 3 commits April 4, 2020 18:24

Fix typo

5a48763

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

Merge branch 'master' of https://github.com/mainflux/mainflux into envs

0cebd75

Merge branch 'master' into envs

28fcbfc

dborovcanin requested changes Apr 6, 2020

View reviewed changes

cmd/cassandra-reader/main.go Outdated Show resolved Hide resolved

manuio added 4 commits April 6, 2020 12:11

Fix cassandra ENVARS

88c02bb

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

Merge branch 'envs' of https://github.com/manuio/mainflux into envs

e5d5c94

Fix cassandra reader ENVARS

4ebc121

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

Merge branch 'master' of https://github.com/mainflux/mainflux into envs

4476432

blokovi previously approved these changes Apr 6, 2020

View reviewed changes

Merge branch 'master' into envs

134f56b

dborovcanin requested changes Apr 7, 2020

View reviewed changes

Fix readers and writers envars

e9d2c64

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

manuio dismissed blokovi’s stale review via e9d2c64 April 7, 2020 08:54

drasko previously approved these changes Apr 7, 2020

View reviewed changes

Fix readers and writers .env

baf680c

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

manuio dismissed drasko’s stale review via baf680c April 7, 2020 09:31

dborovcanin requested changes Apr 7, 2020

View reviewed changes

drasko previously approved these changes Apr 7, 2020

View reviewed changes

Fix reviews

fe819c8

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

manuio dismissed drasko’s stale review via fe819c8 April 7, 2020 09:44

dborovcanin approved these changes Apr 7, 2020

View reviewed changes

drasko approved these changes Apr 7, 2020

View reviewed changes

drasko merged commit 6c39c85 into absmach:master Apr 7, 2020

manuio deleted the envs branch April 7, 2020 10:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MF-1096 - Fix AuthN and Things Auth ENVARS #1066

MF-1096 - Fix AuthN and Things Auth ENVARS #1066

manuio commented Mar 9, 2020 •

edited

Loading

codecov-io commented Mar 9, 2020 •

edited

Loading

drasko left a comment

drasko commented Mar 21, 2020

manuio commented Mar 21, 2020

drasko left a comment

drasko left a comment

drasko Apr 4, 2020

dborovcanin Apr 7, 2020

manuio Apr 7, 2020

dborovcanin Apr 7, 2020

dborovcanin Apr 7, 2020

drasko left a comment

dborovcanin Apr 7, 2020

dborovcanin Apr 7, 2020

dborovcanin Apr 7, 2020

drasko left a comment

drasko left a comment

		Username: mainflux.Env(envDBUser, defDBUser),
		Password: mainflux.Env(envDBPass, defDBPass),

MF-1096 - Fix AuthN and Things Auth ENVARS #1066

MF-1096 - Fix AuthN and Things Auth ENVARS #1066

Conversation

manuio commented Mar 9, 2020 • edited Loading

codecov-io commented Mar 9, 2020 • edited Loading

Codecov Report

drasko left a comment

Choose a reason for hiding this comment

drasko commented Mar 21, 2020

manuio commented Mar 21, 2020

drasko 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

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

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

drasko left a comment

Choose a reason for hiding this comment

manuio commented Mar 9, 2020 •

edited

Loading

codecov-io commented Mar 9, 2020 •

edited

Loading