Simplify db connection handling

Due to incompatibilities with update of github.com/titpetric/factory,
we are crippeling db connection handling (MustGet fn) - only supporting
one ("default") connection

compose/app.go

@@ -49,7 +49,7 @@ func (app *App) Setup(log *zap.Logger, opts *app.Options) (err error) {
 }
 
 func (app *App) Upgrade(ctx context.Context) (err error) {
-	db := factory.Database.MustGet(SERVICE, "default").With(ctx).Quiet()
+	db := factory.Database.MustGet().With(ctx).Quiet()
 	err = migrate.Migrate(db, app.Log)
 	if err != nil {
 		return

compose/repository/repository.go

@@ -15,7 +15,7 @@ type (
 
 // DB produces a contextual DB handle
 func DB(ctx context.Context) *factory.DB {
-	return factory.Database.MustGet("compose", "default").With(ctx)
+	return factory.Database.MustGet().With(ctx)
 }
 
 // With updates repository and database contexts

messaging/app.go

@@ -55,7 +55,7 @@ func (app *App) Setup(log *zap.Logger, opts *app.Options) (err error) {
 }
 
 func (app *App) Upgrade(ctx context.Context) (err error) {
-	db := factory.Database.MustGet(SERVICE, "default").With(ctx).Quiet()
+	db := factory.Database.MustGet().With(ctx).Quiet()
 	err = migrate.Migrate(db, app.Log)
 	if err != nil {
 		return

messaging/repository/repository.go

@@ -15,7 +15,7 @@ type (
 
 // DB produces a contextual DB handle
 func DB(ctx context.Context) *factory.DB {
-	return factory.Database.MustGet("messaging", "default").With(ctx)
+	return factory.Database.MustGet().With(ctx)
 }
 
 // With updates repository and database contexts

pkg/automation/command.go

@@ -191,7 +191,7 @@ func ScriptExporter(subsys string) *cobra.Command {
 
 				ctx = cli.Context()
 
-				db = factory.Database.MustGet(subsys, "default").With(ctx) //.Quiet()
+				db = factory.Database.MustGet().With(ctx) //.Quiet()
 
 				// Skip deleted, scripts, ones named test and those with empty source
 				scriptQuery = squirrel.

pkg/db/connector.go

@@ -25,7 +25,8 @@ func TryToConnect(ctx context.Context, log *zap.Logger, opt options.DBOpt) (db *
 	}
 
 	name := "default"
-	factory.Database.Add(name, opt.DSN)
+
+	factory.Database.Add(name, factory.DatabaseCredential{DSN: opt.DSN, DriverName: "mysql"})
 
 	var (
 		connErrCh = make(chan error, 1)

system/app.go

@@ -50,7 +50,7 @@ func (app *App) Setup(log *zap.Logger, opts *app.Options) (err error) {
 }
 
 func (app *App) Upgrade(ctx context.Context) (err error) {
-	db := factory.Database.MustGet(SERVICE, "default").With(ctx).Quiet()
+	db := factory.Database.MustGet().With(ctx).Quiet()
 	err = migrate.Migrate(db, app.Log)
 	if err != nil {
 		return

system/commands/auth.go

@@ -74,7 +74,7 @@ func Auth() *cobra.Command {
 		Run: func(cmd *cobra.Command, args []string) {
 			var (
 				ctx = auth.SetSuperUserContext(cli.Context())
-				db  = factory.Database.MustGet("system", "default")
+				db  = factory.Database.MustGet()
 
 				userRepo = repository.User(ctx, db)
 				roleRepo = repository.Role(ctx, db)

system/commands/roles.go

@@ -27,7 +27,7 @@ func Roles() *cobra.Command {
 			// Create role and user repository.
 			var (
 				ctx = auth.SetSuperUserContext(cli.Context())
-				db  = factory.Database.MustGet("system", "default")
+				db  = factory.Database.MustGet()
 
 				roleStr, userStr = args[0], args[1]
 

system/commands/users.go

@@ -35,7 +35,7 @@ func Users() *cobra.Command {
 		Run: func(cmd *cobra.Command, args []string) {
 			var (
 				ctx = auth.SetSuperUserContext(cli.Context())
-				db  = factory.Database.MustGet("system", "default")
+				db  = factory.Database.MustGet()
 
 				queryFlag = cmd.Flags().Lookup("query").Value.String()
 				limitFlag = cmd.Flags().Lookup("limit").Value.String()
@@ -95,7 +95,7 @@ func Users() *cobra.Command {
 			var (
 				ctx = auth.SetSuperUserContext(cli.Context())
 
-				db = factory.Database.MustGet("system", "default")
+				db = factory.Database.MustGet()
 
 				userRepo = repository.User(ctx, db)
 				authSvc  = service.Auth(ctx)
@@ -152,7 +152,7 @@ func Users() *cobra.Command {
 		Run: func(cmd *cobra.Command, args []string) {
 			var (
 				ctx = auth.SetSuperUserContext(cli.Context())
-				db  = factory.Database.MustGet("system", "default")
+				db  = factory.Database.MustGet()
 
 				userRepo = repository.User(ctx, db)
 				authSvc  = service.Auth(ctx)

system/provision.go

@@ -57,7 +57,7 @@ func isProvisioned(ctx context.Context) (bool, error) {
 }
 
 func makeDefaultApplications(ctx context.Context, log *zap.Logger) error {
-	db := factory.Database.MustGet("system", "default")
+	db := factory.Database.MustGet()
 
 	repo := repository.Application(ctx, db)
 

system/repository/repository.go

@@ -15,7 +15,7 @@ type (
 
 // DB produces a contextual DB handle
 func DB(ctx context.Context) *factory.DB {
-	return factory.Database.MustGet("system", "default").With(ctx)
+	return factory.Database.MustGet().With(ctx)
 }
 
 // With updates repository and database contexts

tests/compose/main_test.go

@@ -55,7 +55,7 @@ func init() {
 }
 
 func db() *factory.DB {
-	return factory.Database.MustGet(compose.SERVICE, "default").With(context.Background())
+	return factory.Database.MustGet().With(context.Background())
 }
 
 func (app *TestApp) Initialize(ctx context.Context) (err error) {

tests/messaging/main_test.go

@@ -52,7 +52,7 @@ func init() {
 }
 
 func db() *factory.DB {
-	return factory.Database.MustGet(messaging.SERVICE, "default").With(context.Background())
+	return factory.Database.MustGet().With(context.Background())
 }
 
 func (app *TestApp) Initialize(ctx context.Context) (err error) {

tests/system/main_test.go

@@ -59,7 +59,7 @@ func rs(a ...int) string {
 }
 
 func db() *factory.DB {
-	return factory.Database.MustGet(system.SERVICE, "default").With(context.Background())
+	return factory.Database.MustGet().With(context.Background())
 }
 
 func (app *TestApp) Initialize(ctx context.Context) (err error) {