chore: remove requirement of using flipt_analytics for the user to us…

…e any database they want

cmd/flipt/migrate.go

@@ -10,8 +10,8 @@ import (
 )
 
 const (
-	regular   = "regular"
-	analytics = "analytics"
+	defaultConfig = "default"
+	analytics     = "analytics"
 )
 
 var database string
@@ -59,7 +59,7 @@ func newMigrateCommand() *cobra.Command {
 
 			// Run the OLTP and OLAP database migrations sequentially because of
 			// potential danger in DB migrations in general.
-			if err := runMigrations(cfg, logger, regular); err != nil {
+			if err := runMigrations(cfg, logger, defaultConfig); err != nil {
 				return err
 			}
 
@@ -74,6 +74,6 @@ func newMigrateCommand() *cobra.Command {
 	}
 
 	cmd.Flags().StringVar(&providedConfigFile, "config", "", "path to config file")
-	cmd.Flags().StringVar(&database, "database", "regular", "string to denote which database type to migrate")
+	cmd.Flags().StringVar(&database, "database", "default", "string to denote which database type to migrate")
 	return cmd
 }

internal/config/analytics.go

@@ -8,8 +8,6 @@ import (
 	"github.com/spf13/viper"
 )
 
-var ErrWrongDatabase error = errors.New("database should be flipt_analytics")
-
 // AnalyticsConfig defines the configuration for various mechanisms for
 // reporting and querying analytical data for Flipt.
 type AnalyticsConfig struct {
@@ -38,17 +36,13 @@ func (c *ClickhouseConfig) Options() (*clickhouse.Options, error) {
 	if err != nil {
 		return nil, err
 	}
-	if options.Auth.Database != "flipt_analytics" {
-		return nil, ErrWrongDatabase
-	}
 
 	return options, nil
 }
 
 //nolint:unparam
 func (a *AnalyticsConfig) setDefaults(v *viper.Viper) error {
 	v.SetDefault("analytics", map[string]any{
-		"enabled": "false",
 		"clickhouse": map[string]any{
 			"enabled": "false",
 			"url":     "",

internal/storage/sql/migrator.go

@@ -97,8 +97,13 @@ func NewAnalyticsMigrator(cfg config.Config, logger *zap.Logger) (*Migrator, err
 	var dr database.Driver
 
 	if driver == Clickhouse {
+		options, err := cfg.Analytics.Storage.Clickhouse.Options()
+		if err != nil {
+			return nil, err
+		}
+
 		dr, err = clickhouseMigrate.WithInstance(sql, &clickhouseMigrate.Config{
-			DatabaseName:          "flipt_analytics",
+			DatabaseName:          options.Auth.Database,
 			MigrationsTableEngine: "MergeTree",
 		})
 		if err != nil {