Сonfig v2

cmd/config-migrate/main.go

@@ -0,0 +1,48 @@
+package main
+
+import (
+	"errors"
+	"flag"
+	"os"
+
+	"github.com/ozontech/seq-ui/internal/app/config"
+	"github.com/ozontech/seq-ui/logger"
+	"go.uber.org/zap"
+)
+
+var (
+	source = flag.String("source", "", "path to the config file to migrate in place")
+)
+
+func main() {
+	flag.Parse()
+
+	run(*source)
+}
+
+func run(source string) {
+	if source == "" {
+		logger.Fatal("missing required parameter", zap.String("param", "-source"))
+	}
+
+	legacyCfg, err := os.ReadFile(source)
+	if err != nil {
+		logger.Fatal("error reading legacy config", zap.String("source", source), zap.Error(err))
+	}
+
+	backupPath := source + ".bak"
+
+	if _, err := os.Stat(backupPath); err == nil {
+		logger.Fatal("backup already exists, remove it before re-running", zap.String("backup", backupPath))
+	} else if !errors.Is(err, os.ErrNotExist) {
+		logger.Fatal("stat backup", zap.String("backup", backupPath), zap.Error(err))
+	}
+	if err := os.WriteFile(backupPath, legacyCfg, 0644); err != nil {
+		logger.Fatal("error writing backup legacy config", zap.String("backup", backupPath), zap.Error(err))
+	}
+
+	backupCfg, err := config.FromFile(backupPath)
+	if err != nil {
+		logger.Fatal("read backup config file error", zap.Error(err))
+	}
+}

cmd/seq-ui/main.go

@@ -23,7 +23,7 @@ import (
 	massexport_v1 "github.com/ozontech/seq-ui/internal/api/massexport/v1"
 	seqapi_v1 "github.com/ozontech/seq-ui/internal/api/seqapi/v1"
 	userprofile_v1 "github.com/ozontech/seq-ui/internal/api/userprofile/v1"
-	"github.com/ozontech/seq-ui/internal/app/config"
+	config "github.com/ozontech/seq-ui/internal/app/config/v2"
 	"github.com/ozontech/seq-ui/internal/app/server"
 	"github.com/ozontech/seq-ui/internal/pkg/cache"
 	"github.com/ozontech/seq-ui/internal/pkg/client/seqdb"
@@ -104,7 +104,7 @@ func run(ctx context.Context) {
 	}
 }
 
-func initApp(ctx context.Context, cfg config.Config) *api.Registrar {
+func initApp(ctx context.Context, cfg config_v2.Config) *api.Registrar {
 	logger.Info("initializing seq-db clients")
 	seqDBClients, err := initSeqDBClients(ctx, cfg)
 	if err != nil {
@@ -146,7 +146,7 @@ func initApp(ctx context.Context, cfg config.Config) *api.Registrar {
 	}
 
 	logger.Info("initializing db")
-	db, err := initDb(ctx, cfg.Server.DB)
+	db, err := initDb(ctx, cfg.DB)
 	if err != nil {
 		logger.Fatal("failed to init db", zap.Error(err))
 	}
@@ -225,7 +225,7 @@ func createSeqBDClient(ctx context.Context, cfg config.SeqDBClient, seqAPI confi
 	return seqdb.NewGRPCClient(ctx, clientParams)
 }
 
-func initDb(ctx context.Context, cfg *config.DB) (*pgxpool.Pool, error) {
+func initDb(ctx context.Context, cfg *config_v2.DB) (*pgxpool.Pool, error) {
 	if cfg == nil {
 		logger.Warn("db config is nil, running without db")
 		return nil, nil

config/config.example.yaml

@@ -1,3 +1,5 @@
+version: 2
+
 server:
   http_addr: ":5555"
   grpc_addr: ":5556"

config/config.multicluster.yaml

@@ -1,3 +1,5 @@
+version: 2
+
 server:
   http_addr: ":5555"
   grpc_addr: ":5556"

docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.8'
+version: "3.8"
 
 services:
   postgres: