feat: Add revision history limit to proxy configuration

Author: iFurySt

.env.example

@@ -44,6 +44,7 @@ GATEWAY_STORAGE_DISK_PATH=
 GATEWAY_STORAGE_API_URL=
 GATEWAY_STORAGE_API_CONFIG_JSON_PATH=
 GATEWAY_STORAGE_API_TIMEOUT=5s
+GATEWAY_STORAGE_REVISION_HISTORY_LIMIT=10
 
 # Notifier Configuration
 APISERVER_NOTIFIER_ROLE=sender

configs/apiserver.yaml

@@ -32,6 +32,7 @@ database:
 # Storage configuration
 storage:
   type: "${GATEWAY_STORAGE_TYPE:db}"  # disk or db
+  revision_history_limit: ${GATEWAY_STORAGE_REVISION_HISTORY_LIMIT:10}  # number of versions to keep
   # Database configuration (only used when type is db)
   database:
     type: "${GATEWAY_DB_TYPE:sqlite}"

internal/common/config/storage.go

@@ -4,10 +4,11 @@ import "time"
 
 type (
 	StorageConfig struct {
-		Type     string            `yaml:"type"`     // disk or db
-		Database DatabaseConfig    `yaml:"database"` // database configuration for db type
-		Disk     DiskStorageConfig `yaml:"disk"`     // disk configuration for disk type
-		API      APIStorageConfig  `yaml:"api"`      // disk configuration for api type
+		Type                 string            `yaml:"type"`                   // disk or db
+		RevisionHistoryLimit int               `yaml:"revision_history_limit"` // number of versions to keep
+		Database             DatabaseConfig    `yaml:"database"`               // database configuration for db type
+		Disk                 DiskStorageConfig `yaml:"disk"`                   // disk configuration for disk type
+		API                  APIStorageConfig  `yaml:"api"`                    // disk configuration for api type
 	}
 
 	DiskStorageConfig struct {

internal/mcp/storage/db.go

@@ -17,15 +17,7 @@ import (
 	"gorm.io/gorm/clause"
 )
 
-// DBStore implements the Store interface using a database
-type DBStore struct {
-	logger *zap.Logger
-	db     *gorm.DB
-}
-
-var _ Store = (*DBStore)(nil)
-
-// DatabaseType represents the supported database types
+// DatabaseType represents the type of database
 type DatabaseType string
 
 const (
@@ -34,18 +26,27 @@ const (
 	SQLite     DatabaseType = "sqlite"
 )
 
+// DBStore implements the Store interface using a database
+type DBStore struct {
+	logger *zap.Logger
+	db     *gorm.DB
+	cfg    *config.StorageConfig
+}
+
+var _ Store = (*DBStore)(nil)
+
 // NewDBStore creates a new database-based store
-func NewDBStore(logger *zap.Logger, dbType DatabaseType, dsn string) (*DBStore, error) {
+func NewDBStore(logger *zap.Logger, cfg *config.StorageConfig) (*DBStore, error) {
 	logger = logger.Named("mcp.store.db")
 
 	var dialector gorm.Dialector
-	switch dbType {
+	switch DatabaseType(cfg.Database.Type) {
 	case PostgreSQL:
-		dialector = postgres.Open(dsn)
+		dialector = postgres.Open(cfg.Database.GetDSN())
 	case MySQL:
-		dialector = mysql.Open(dsn)
+		dialector = mysql.Open(cfg.Database.GetDSN())
 	case SQLite:
-		dialector = sqlite.Open(dsn)
+		dialector = sqlite.Open(cfg.Database.GetDSN())
 	default:
 		return nil, gorm.ErrInvalidDB
 	}
@@ -63,6 +64,7 @@ func NewDBStore(logger *zap.Logger, dbType DatabaseType, dsn string) (*DBStore,
 	return &DBStore{
 		logger: logger,
 		db:     db,
+		cfg:    cfg,
 	}, nil
 }
 
@@ -281,6 +283,23 @@ func (s *DBStore) Update(ctx context.Context, server *config.MCPConfig) error {
 			return err
 		}
 
+		// Delete old versions if revision history limit is set
+		if s.cfg.RevisionHistoryLimit > 0 {
+			var versionsToDelete []MCPConfigVersion
+			if err := tx.Where("tenant = ? AND name = ?", server.Tenant, server.Name).
+				Order("version DESC").
+				Offset(s.cfg.RevisionHistoryLimit).
+				Find(&versionsToDelete).Error; err != nil {
+				return err
+			}
+
+			for _, v := range versionsToDelete {
+				if err := tx.Delete(&v).Error; err != nil {
+					return err
+				}
+			}
+		}
+
 		return nil
 	})
 }

internal/mcp/storage/disk.go

@@ -23,24 +23,28 @@ type DiskStore struct {
 	logger  *zap.Logger
 	baseDir string
 	mu      sync.RWMutex
+	cfg     *config.StorageConfig
 }
 
 var _ Store = (*DiskStore)(nil)
 
 // NewDiskStore creates a new disk-based store
-func NewDiskStore(logger *zap.Logger, baseDir string) (*DiskStore, error) {
-	logger = logger.Named("mcp.store")
+func NewDiskStore(logger *zap.Logger, cfg *config.StorageConfig) (*DiskStore, error) {
+	logger = logger.Named("mcp.store.disk")
 
-	baseDir = getConfigPath(baseDir)
-	logger.Info("Using configuration directory", zap.String("path", baseDir))
+	baseDir := cfg.Disk.Path
+	if baseDir == "" {
+		baseDir = "./data"
+	}
 
 	if err := os.MkdirAll(baseDir, 0755); err != nil {
 		return nil, err
 	}
 
 	return &DiskStore{
-		logger:  logger,
 		baseDir: baseDir,
+		logger:  logger,
+		cfg:     cfg,
 	}, nil
 }
 
@@ -218,6 +222,20 @@ func (s *DiskStore) Update(_ context.Context, server *config.MCPConfig) error {
 		return err
 	}
 
+	// Delete old versions if revision history limit is set
+	if s.cfg.RevisionHistoryLimit > 0 && len(entries) >= s.cfg.RevisionHistoryLimit {
+		for i := s.cfg.RevisionHistoryLimit; i < len(entries); i++ {
+			oldVersionPath := filepath.Join(versionsDir, entries[i].Name())
+			if err := os.Remove(oldVersionPath); err != nil {
+				s.logger.Error("failed to delete old version",
+					zap.String("tenant", server.Tenant),
+					zap.String("name", server.Name),
+					zap.String("version", entries[i].Name()),
+					zap.Error(err))
+			}
+		}
+	}
+
 	return os.WriteFile(path, data, 0644)
 }
 

internal/mcp/storage/factory.go

@@ -13,13 +13,9 @@ func NewStore(logger *zap.Logger, cfg *config.StorageConfig) (Store, error) {
 	logger.Info("Initializing storage", zap.String("type", cfg.Type))
 	switch cfg.Type {
 	case "disk":
-		return NewDiskStore(logger, cfg.Disk.Path)
+		return NewDiskStore(logger, cfg)
 	case "db":
-		dsn, err := buildDSN(&cfg.Database)
-		if err != nil {
-			return nil, err
-		}
-		return NewDBStore(logger, DatabaseType(cfg.Database.Type), dsn)
+		return NewDBStore(logger, cfg)
 	case "api":
 		return NewAPIStore(logger, cfg.API.Url, cfg.API.ConfigJSONPath, cfg.API.Timeout)
 	default: