absmach
diff --git a/‎auth/README.md
Lines changed: 1 addition & 1 deletion b/‎auth/README.md
Lines changed: 1 addition & 1 deletion
diff --git a/‎auth/postgres/init.go
Lines changed: 7 additions & 44 deletions b/‎auth/postgres/init.go
Lines changed: 7 additions & 44 deletions
diff --git a/‎auth/postgres/setup_test.go
Lines changed: 4 additions & 4 deletions b/‎auth/postgres/setup_test.go
Lines changed: 4 additions & 4 deletions
diff --git a/‎bootstrap/README.md
Lines changed: 2 additions & 3 deletions b/‎bootstrap/README.md
Lines changed: 2 additions & 3 deletions
diff --git a/‎bootstrap/postgres/init.go
Lines changed: 4 additions & 44 deletions b/‎bootstrap/postgres/init.go
Lines changed: 4 additions & 44 deletions
diff --git a/‎bootstrap/postgres/setup_test.go
Lines changed: 4 additions & 4 deletions b/‎bootstrap/postgres/setup_test.go
Lines changed: 4 additions & 4 deletions
diff --git a/‎certs/postgres/certs.go
Lines changed: 1 addition & 1 deletion b/‎certs/postgres/certs.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎certs/postgres/init.go
Lines changed: 4 additions & 53 deletions b/‎certs/postgres/init.go
Lines changed: 4 additions & 53 deletions
diff --git a/‎certs/postgres/setup_test.go
Lines changed: 3 additions & 2 deletions b/‎certs/postgres/setup_test.go
Lines changed: 3 additions & 2 deletions
diff --git a/‎certs/service.go
Lines changed: 2 additions & 28 deletions b/‎certs/service.go
Lines changed: 2 additions & 28 deletions
@@ -57,7 +57,7 @@ default values.
 
 | Variable                      | Description                                                              | Default        |
 |-------------------------------|--------------------------------------------------------------------------|----------------|
-| MF_AUTH_LOG_LEVEL             | Service level (debug, info, warn, error)                                 | error          |
+| MF_AUTH_LOG_LEVEL             | Service level (debug, info, warn, error)                                 | info           |
 | MF_AUTH_DB_HOST               | Database host address                                                    | localhost      |
 | MF_AUTH_DB_PORT               | Database host port                                                       | 5432           |
 | MF_AUTH_DB_USER               | Database user                                                            | mainflux       |
 
@@ -3,45 +3,11 @@
 
 package postgres
 
-import (
-	"fmt"
+import migrate "github.com/rubenv/sql-migrate"
 
-	_ "github.com/jackc/pgx/v5/stdlib" // required for SQL access
-	"github.com/jmoiron/sqlx"
-	migrate "github.com/rubenv/sql-migrate"
-)
-
-// Config defines the options that are used when connecting to a PostgreSQL instance
-type Config struct {
-	Host        string
-	Port        string
-	User        string
-	Pass        string
-	Name        string
-	SSLMode     string
-	SSLCert     string
-	SSLKey      string
-	SSLRootCert string
-}
-
-// Connect creates a connection to the PostgreSQL instance and applies any
-// unapplied database migrations. A non-nil error is returned to indicate failure.
-func Connect(cfg Config) (*sqlx.DB, error) {
-	url := fmt.Sprintf("host=%s port=%s user=%s dbname=%s password=%s sslmode=%s sslcert=%s sslkey=%s sslrootcert=%s", cfg.Host, cfg.Port, cfg.User, cfg.Name, cfg.Pass, cfg.SSLMode, cfg.SSLCert, cfg.SSLKey, cfg.SSLRootCert)
-
-	db, err := sqlx.Open("pgx", url)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := migrateDB(db); err != nil {
-		return nil, err
-	}
-	return db, nil
-}
-
-func migrateDB(db *sqlx.DB) error {
-	migrations := &migrate.MemoryMigrationSource{
+// Migration of Auth service
+func Migration() *migrate.MemoryMigrationSource {
+	return &migrate.MemoryMigrationSource{
 		Migrations: []*migrate.Migration{
 			{
 				Id: "auth_1",
@@ -56,9 +22,9 @@ func migrateDB(db *sqlx.DB) error {
 						PRIMARY KEY (id, issuer_id)
 					)`,
 					`CREATE EXTENSION IF NOT EXISTS LTREE`,
-					`CREATE TABLE IF NOT EXISTS groups ( 
+					`CREATE TABLE IF NOT EXISTS groups (
 						id          VARCHAR(254) UNIQUE NOT NULL,
-						parent_id   VARCHAR(254), 
+						parent_id   VARCHAR(254),
 						owner_id    VARCHAR(254),
 						name        VARCHAR(254) NOT NULL,
 						description VARCHAR(1024),
@@ -80,7 +46,7 @@ func migrateDB(db *sqlx.DB) error {
 				   )`,
 					`CREATE INDEX path_gist_idx ON groups USING GIST (path);`,
 					`CREATE OR REPLACE FUNCTION inherit_group()
-					 RETURNS trigger 
+					 RETURNS trigger
 					 LANGUAGE PLPGSQL
 					 AS
 					 $$
@@ -112,7 +78,4 @@ func migrateDB(db *sqlx.DB) error {
 			},
 		},
 	}
-
-	_, err := migrate.Exec(db.DB, "postgres", migrations, migrate.Up)
-	return err
 }
@@ -12,9 +12,9 @@ import (
 	"os"
 	"testing"
 
-	_ "github.com/jackc/pgx/v5/stdlib" // required for SQL access
 	"github.com/jmoiron/sqlx"
-	"github.com/mainflux/mainflux/auth/postgres"
+	authRepo "github.com/mainflux/mainflux/auth/postgres"
+	pgClient "github.com/mainflux/mainflux/internal/clients/postgres"
 	dockertest "github.com/ory/dockertest/v3"
 )
 
@@ -49,7 +49,7 @@ func TestMain(m *testing.M) {
 		log.Fatalf("Could not connect to docker: %s", err)
 	}
 
-	dbConfig := postgres.Config{
+	dbConfig := pgClient.Config{
 		Host:        "localhost",
 		Port:        port,
 		User:        "test",
@@ -61,7 +61,7 @@ func TestMain(m *testing.M) {
 		SSLRootCert: "",
 	}
 
-	if db, err = postgres.Connect(dbConfig); err != nil {
+	if db, err = pgClient.SetupDB(dbConfig, *authRepo.Migration()); err != nil {
 		log.Fatalf("Could not setup test DB connection: %s", err)
 	}
 
 
@@ -37,7 +37,7 @@ The service is configured using the environment variables presented in the follo
 
 | Variable                      | Description                                                             | Default                          |
 |-------------------------------|-------------------------------------------------------------------------|----------------------------------|
-| MF_BOOTSTRAP_LOG_LEVEL        | Log level for Bootstrap (debug, info, warn, error)                      | error                            |
+| MF_BOOTSTRAP_LOG_LEVEL        | Log level for Bootstrap (debug, info, warn, error)                      | info                             |
 | MF_BOOTSTRAP_DB_HOST          | Database host address                                                   | localhost                        |
 | MF_BOOTSTRAP_DB_PORT          | Database host port                                                      | 5432                             |
 | MF_BOOTSTRAP_DB_USER          | Database user                                                           | mainflux                         |
@@ -53,8 +53,7 @@ The service is configured using the environment variables presented in the follo
 | MF_BOOTSTRAP_PORT             | Bootstrap service HTTP port                                             | 8180                             |
 | MF_BOOTSTRAP_SERVER_CERT      | Path to server certificate in pem format                                |                                  |
 | MF_BOOTSTRAP_SERVER_KEY       | Path to server key in pem format                                        |                                  |
-| MF_SDK_BASE_URL               | Base url for Mainflux SDK                                               | http://localhost                 |
-| MF_SDK_THINGS_PREFIX          | SDK prefix for Things service                                           |                                  |
+| MF_THINGS_URL                 | Base url for Mainflux Things                                            | http://localhost                 |
 | MF_THINGS_ES_URL              | Things service event source URL                                         | localhost:6379                   |
 | MF_THINGS_ES_PASS             | Things service event source password                                    |                                  |
 | MF_THINGS_ES_DB               | Things service event source database                                    | 0                                |
 
@@ -3,47 +3,11 @@
 
 package postgres
 
-import (
-	"fmt"
+import migrate "github.com/rubenv/sql-migrate"
 
-	_ "github.com/jackc/pgx/v5/stdlib" // required for SQL access
-	"github.com/jmoiron/sqlx"
-	migrate "github.com/rubenv/sql-migrate"
-)
-
-// Config defines the options that are used when connecting to a PostgreSQL instance
-type Config struct {
-	Host        string
-	Port        string
-	User        string
-	Pass        string
-	Name        string
-	SSLMode     string
-	SSLCert     string
-	SSLKey      string
-	SSLRootCert string
-}
-
-// Connect creates a connection to the PostgreSQL instance and applies any
-// unapplied database migrations. A non-nil error is returned to indicate
-// failure.
-func Connect(cfg Config) (*sqlx.DB, error) {
-	url := fmt.Sprintf("host=%s port=%s user=%s dbname=%s password=%s sslmode=%s sslcert=%s sslkey=%s sslrootcert=%s", cfg.Host, cfg.Port, cfg.User, cfg.Name, cfg.Pass, cfg.SSLMode, cfg.SSLCert, cfg.SSLKey, cfg.SSLRootCert)
-
-	db, err := sqlx.Open("pgx", url)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := migrateDB(db); err != nil {
-		return nil, err
-	}
-
-	return db, nil
-}
-
-func migrateDB(db *sqlx.DB) error {
-	migrations := &migrate.MemoryMigrationSource{
+// Migration of bootstrap service
+func Migration() *migrate.MemoryMigrationSource {
+	return &migrate.MemoryMigrationSource{
 		Migrations: []*migrate.Migration{
 			{
 				Id: "configs_1",
@@ -102,8 +66,4 @@ func migrateDB(db *sqlx.DB) error {
 			},
 		},
 	}
-
-	_, err := migrate.Exec(db.DB, "postgres", migrations, migrate.Up)
-
-	return err
 }
@@ -8,9 +8,9 @@ import (
 	"os"
 	"testing"
 
-	_ "github.com/jackc/pgx/v5/stdlib" // required for SQL access
 	"github.com/jmoiron/sqlx"
-	"github.com/mainflux/mainflux/bootstrap/postgres"
+	bootstrapRepo "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"
@@ -50,7 +50,7 @@ func TestMain(m *testing.M) {
 		testLog.Error(fmt.Sprintf("Could not connect to docker: %s", err))
 	}
 
-	dbConfig := postgres.Config{
+	dbConfig := pgClient.Config{
 		Host:        "localhost",
 		Port:        port,
 		User:        "test",
@@ -62,7 +62,7 @@ func TestMain(m *testing.M) {
 		SSLRootCert: "",
 	}
 
-	if db, err = postgres.Connect(dbConfig); err != nil {
+	if db, err = pgClient.SetupDB(dbConfig, *bootstrapRepo.Migration()); err != nil {
 		testLog.Error(fmt.Sprintf("Could not setup test DB connection: %s", err))
 	}
 
 
@@ -11,7 +11,7 @@ import (
 
 	"github.com/jackc/pgerrcode"
 	"github.com/jackc/pgx/v5/pgconn"
-	_ "github.com/jackc/pgx/v5/stdlib" // required for SQL access
+
 	"github.com/jmoiron/sqlx"
 	"github.com/mainflux/mainflux/certs"
 	"github.com/mainflux/mainflux/logger"
 
@@ -5,57 +5,11 @@
 
 package postgres
 
-import (
-	"errors"
-	"fmt"
+import migrate "github.com/rubenv/sql-migrate"
 
-	_ "github.com/jackc/pgx/v5/stdlib" // required for SQL access
-	"github.com/jmoiron/sqlx"
-	migrate "github.com/rubenv/sql-migrate"
-)
-
-const primaryKey = "primary_key"
-
-// ErrMigrate indicates error during database migrations.
-var ErrMigrate = errors.New("error executing database migrations")
-
-// Config defines the options that are used when connecting to a PostgreSQL instance
-type Config struct {
-	Host        string
-	Port        string
-	User        string
-	Pass        string
-	Name        string
-	SSLMode     string
-	SSLCert     string
-	SSLKey      string
-	SSLRootCert string
-}
-
-// Connect creates a connection to the PostgreSQL instance and applies any
-// unapplied database migrations. A non-nil error is returned to indicate
-// failure.
-func Connect(cfg Config) (*sqlx.DB, error) {
-	url := fmt.Sprintf("host=%s port=%s user=%s dbname=%s password=%s sslmode=%s sslcert=%s sslkey=%s sslrootcert=%s", cfg.Host, cfg.Port, cfg.User, cfg.Name, cfg.Pass, cfg.SSLMode, cfg.SSLCert, cfg.SSLKey, cfg.SSLRootCert)
-
-	db, err := sqlx.Open("pgx", url)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := migrateDB(db); err != nil {
-		mErr, ok := err.(*migrate.TxError)
-		if ok && mErr.Migration.Id == primaryKey {
-			return db, ErrMigrate
-		}
-		return nil, err
-	}
-
-	return db, nil
-}
-
-func migrateDB(db *sqlx.DB) error {
-	migrations := &migrate.MemoryMigrationSource{
+// Migration of Certs service
+func Migration() *migrate.MemoryMigrationSource {
+	return &migrate.MemoryMigrationSource{
 		Migrations: []*migrate.Migration{
 			{
 				Id: "certs_1",
@@ -74,7 +28,4 @@ func migrateDB(db *sqlx.DB) error {
 			},
 		},
 	}
-
-	_, err := migrate.Exec(db.DB, "postgres", migrations, migrate.Up)
-	return err
 }
@@ -10,6 +10,7 @@ import (
 
 	"github.com/jmoiron/sqlx"
 	"github.com/mainflux/mainflux/certs/postgres"
+	pgClient "github.com/mainflux/mainflux/internal/clients/postgres"
 	"github.com/mainflux/mainflux/logger"
 	dockertest "github.com/ory/dockertest/v3"
 )
@@ -49,7 +50,7 @@ func TestMain(m *testing.M) {
 		testLog.Error(fmt.Sprintf("Could not connect to docker: %s", err))
 	}
 
-	dbConfig := postgres.Config{
+	dbConfig := pgClient.Config{
 		Host:        "localhost",
 		Port:        port,
 		User:        "test",
@@ -61,7 +62,7 @@ func TestMain(m *testing.M) {
 		SSLRootCert: "",
 	}
 
-	if db, err = postgres.Connect(dbConfig); err != nil {
+	if db, err = pgClient.SetupDB(dbConfig, *postgres.Migration()); err != nil {
 		testLog.Error(fmt.Sprintf("Could not setup test DB connection: %s", err))
 	}
 
 
@@ -5,8 +5,6 @@ package certs
 
 import (
 	"context"
-	"crypto/tls"
-	"crypto/x509"
 	"time"
 
 	"github.com/mainflux/mainflux"
@@ -46,43 +44,19 @@ type Service interface {
 	RevokeCert(ctx context.Context, token, serialID string) (Revoke, error)
 }
 
-// Config defines the service parameters
-type Config struct {
-	LogLevel       string
-	ClientTLS      bool
-	CaCerts        string
-	HTTPPort       string
-	ServerCert     string
-	ServerKey      string
-	CertsURL       string
-	JaegerURL      string
-	AuthURL        string
-	AuthTimeout    time.Duration
-	SignTLSCert    tls.Certificate
-	SignX509Cert   *x509.Certificate
-	SignRSABits    int
-	SignHoursValid string
-	PKIHost        string
-	PKIPath        string
-	PKIRole        string
-	PKIToken       string
-}
-
 type certsService struct {
 	auth      mainflux.AuthServiceClient
 	certsRepo Repository
 	sdk       mfsdk.SDK
-	conf      Config
 	pki       pki.Agent
 }
 
-// New returns new Certs service.
-func New(auth mainflux.AuthServiceClient, certs Repository, sdk mfsdk.SDK, config Config, pki pki.Agent) Service {
+// New returns new Certs service
+func New(auth mainflux.AuthServiceClient, certs Repository, sdk mfsdk.SDK, pki pki.Agent) Service {
 	return &certsService{
 		certsRepo: certs,
 		sdk:       sdk,
 		auth:      auth,
-		conf:      config,
 		pki:       pki,
 	}
 }
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@ import (`
`12`	`12`	`"os"`
`13`	`13`	`"testing"`
`14`	`14`
`15`		`- _ "github.com/jackc/pgx/v5/stdlib" // required for SQL access`
`16`	`15`	`"github.com/jmoiron/sqlx"`
`17`		`- "github.com/mainflux/mainflux/auth/postgres"`
	`16`	`+ authRepo "github.com/mainflux/mainflux/auth/postgres"`
	`17`	`+ pgClient "github.com/mainflux/mainflux/internal/clients/postgres"`
`18`	`18`	`dockertest "github.com/ory/dockertest/v3"`
`19`	`19`	`)`
`20`	`20`
`@@ -49,7 +49,7 @@ func TestMain(m *testing.M) {`
`49`	`49`	`log.Fatalf("Could not connect to docker: %s", err)`
`50`	`50`	`}`
`51`	`51`
`52`		`- dbConfig := postgres.Config{`
	`52`	`+ dbConfig := pgClient.Config{`
`53`	`53`	`Host: "localhost",`
`54`	`54`	`Port: port,`
`55`	`55`	`User: "test",`
`@@ -61,7 +61,7 @@ func TestMain(m *testing.M) {`
`61`	`61`	`SSLRootCert: "",`
`62`	`62`	`}`
`63`	`63`
`64`		`- if db, err = postgres.Connect(dbConfig); err != nil {`
	`64`	`+ if db, err = pgClient.SetupDB(dbConfig, *authRepo.Migration()); err != nil {`
`65`	`65`	`log.Fatalf("Could not setup test DB connection: %s", err)`
`66`	`66`	`}`
`67`	`67`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import (`
`10`	`10`
`11`	`11`	`"github.com/jmoiron/sqlx"`
`12`	`12`	`"github.com/mainflux/mainflux/certs/postgres"`
	`13`	`+ pgClient "github.com/mainflux/mainflux/internal/clients/postgres"`
`13`	`14`	`"github.com/mainflux/mainflux/logger"`
`14`	`15`	`dockertest "github.com/ory/dockertest/v3"`
`15`	`16`	`)`
`@@ -49,7 +50,7 @@ func TestMain(m *testing.M) {`
`49`	`50`	`testLog.Error(fmt.Sprintf("Could not connect to docker: %s", err))`
`50`	`51`	`}`
`51`	`52`
`52`		`- dbConfig := postgres.Config{`
	`53`	`+ dbConfig := pgClient.Config{`
`53`	`54`	`Host: "localhost",`
`54`	`55`	`Port: port,`
`55`	`56`	`User: "test",`
`@@ -61,7 +62,7 @@ func TestMain(m *testing.M) {`
`61`	`62`	`SSLRootCert: "",`
`62`	`63`	`}`
`63`	`64`
`64`		`- if db, err = postgres.Connect(dbConfig); err != nil {`
	`65`	`+ if db, err = pgClient.SetupDB(dbConfig, *postgres.Migration()); err != nil {`
`65`	`66`	`testLog.Error(fmt.Sprintf("Could not setup test DB connection: %s", err))`
`66`	`67`	`}`
`67`	`68`