Don't parse YAML config twice & drop superfluous code

cmd/icinga-kubernetes/main.go

@@ -66,20 +66,16 @@ func main() {
 		klog.Fatal(errors.Wrap(err, "can't create configuration"))
 	}
 
-	d, err := database.FromYAMLFile(configLocation)
-	if err != nil {
-		klog.Fatal(err)
-	}
 	dbLog := log.WithName("database")
-	db, err := database.NewFromConfig(d, dbLog)
+	db, err := database.NewFromConfig(&cfg.Database, dbLog)
 	if err != nil {
 		klog.Fatal(err)
 	}
 	if !db.Connect() {
 		return
 	}
 
-	hasSchema, err := dbHasSchema(db, d.Database)
+	hasSchema, err := dbHasSchema(db, cfg.Database.Database)
 	if err != nil {
 		klog.Fatal(err)
 	}

pkg/database/database.go

@@ -33,7 +33,7 @@ var registerDriversOnce sync.Once
 type Database struct {
 	*sqlx.DB
 
-	Options Options
+	Options database.Options
 
 	log logr.Logger
 
@@ -46,7 +46,7 @@ type Database struct {
 }
 
 // NewFromConfig returns a new Database connection from the given Config.
-func NewFromConfig(c *Config, log logr.Logger) (*Database, error) {
+func NewFromConfig(c *database.Config, log logr.Logger) (*Database, error) {
 	registerDriversOnce.Do(func() {
 		RegisterDrivers(log)
 	})
@@ -99,7 +99,7 @@ func NewFromConfig(c *Config, log logr.Logger) (*Database, error) {
 		uri.RawQuery = query.Encode()
 		dsn = uri.String()
 	default:
-		return nil, unknownDbType(c.Type)
+		return nil, errors.Errorf(`unknown database type %q, must be one of: "mysql", "pgsql"`, c.Type)
 	}
 
 	db, err := sqlx.Open("icinga-"+c.Type, dsn)