From 399c221c220d870d5520d1fecea4434e67a1e7d0 Mon Sep 17 00:00:00 2001 From: Sai Kumar P Date: Thu, 9 Jul 2026 15:14:27 +0200 Subject: [PATCH 1/5] feat: Add database type configuration and centralized database service initialization --- src/config/main.go | 13 ++ src/constants/main.go | 1 + src/database/service/logger.go | 82 ++++++++ src/database/service/service_test.go | 208 +++++++++++++++++++ src/database/service/sqlite_test.go | 192 ++++++++++++++++++ src/serviceprovider/dbservice/database.go | 232 +++++++++++----------- 6 files changed, 610 insertions(+), 118 deletions(-) create mode 100644 src/database/service/logger.go create mode 100644 src/database/service/service_test.go create mode 100644 src/database/service/sqlite_test.go diff --git a/src/config/main.go b/src/config/main.go index b7cce56b..e02d58e7 100644 --- a/src/config/main.go +++ b/src/config/main.go @@ -524,6 +524,19 @@ func (c *Config) DatabaseFolder() string { return c.GetKey(constants.DATABASE_FOLDER_ENV_VAR) } +func (c *Config) DatabaseType() string { + dbType := c.GetKey(constants.DATABASE_TYPE_ENV_VAR) + if dbType == "" { + return "sqlite" // Default to SQLite + } + return dbType +} + +func (c *Config) IsDebugEnabled() bool { + logLevel := c.GetKey(constants.LOG_LEVEL_ENV_VAR) + return logLevel == "debug" || logLevel == "trace" +} + func (c *Config) Localhost() string { schema := "http" host := "localhost" diff --git a/src/constants/main.go b/src/constants/main.go index 933c7736..6a6e332b 100644 --- a/src/constants/main.go +++ b/src/constants/main.go @@ -96,6 +96,7 @@ const ( MODE_ENV_VAR = "MODE" USE_ORCHESTRATOR_RESOURCES_ENV_VAR = "USE_ORCHESTRATOR_RESOURCES" ORCHESTRATOR_PULL_FREQUENCY_SECONDS_ENV_VAR = "ORCHESTRATOR_PULL_FREQUENCY_SECONDS" + DATABASE_TYPE_ENV_VAR = "DATABASE_TYPE" DATABASE_FOLDER_ENV_VAR = "DATABASE_FOLDER" DATABASE_NUMBER_BACKUP_FILES_ENV_VAR = "DATABASE_NUMBER_BACKUP_FILES" DATABASE_BACKUP_INTERVAL_ENV_VAR = "DATABASE_BACKUP_INTERVAL_MINUTES" diff --git a/src/database/service/logger.go b/src/database/service/logger.go new file mode 100644 index 00000000..206fb31a --- /dev/null +++ b/src/database/service/logger.go @@ -0,0 +1,82 @@ +package service + +import ( + "context" + "time" + + "github.com/Parallels/prl-devops-service/basecontext" + "gorm.io/gorm/logger" +) + +// BaseContextLogger is a GORM logger that bridges to basecontext.ApiContext +type BaseContextLogger struct { + ctx basecontext.ApiContext + SlowThreshold time.Duration + IgnoreRecordNotFound bool + LogLevel logger.LogLevel +} + +// NewBaseContextLogger creates a new GORM logger that writes to basecontext +func NewBaseContextLogger(ctx basecontext.ApiContext, level logger.LogLevel) *BaseContextLogger { + return &BaseContextLogger{ + ctx: ctx, + SlowThreshold: 200 * time.Millisecond, + IgnoreRecordNotFound: true, + LogLevel: level, + } +} + +// LogMode sets the log level +func (l *BaseContextLogger) LogMode(level logger.LogLevel) logger.Interface { + newLogger := *l + newLogger.LogLevel = level + return &newLogger +} + +// Info logs info messages +func (l *BaseContextLogger) Info(ctx context.Context, msg string, data ...interface{}) { + if l.LogLevel >= logger.Info { + l.ctx.LogInfof(msg, data...) + } +} + +// Warn logs warning messages +func (l *BaseContextLogger) Warn(ctx context.Context, msg string, data ...interface{}) { + if l.LogLevel >= logger.Warn { + l.ctx.LogWarnf(msg, data...) + } +} + +// Error logs error messages +func (l *BaseContextLogger) Error(ctx context.Context, msg string, data ...interface{}) { + if l.LogLevel >= logger.Error { + l.ctx.LogErrorf(msg, data...) + } +} + +// Trace logs SQL queries and execution time +func (l *BaseContextLogger) Trace(ctx context.Context, begin time.Time, fc func() (sql string, rowsAffected int64), err error) { + if l.LogLevel <= logger.Silent { + return + } + + elapsed := time.Since(begin) + sql, rows := fc() + + switch { + case err != nil && l.LogLevel >= logger.Error: + l.ctx.LogErrorf("[%.3fms] [rows:%d] %s | Error: %v", float64(elapsed.Nanoseconds())/1e6, rows, sql, err) + case elapsed > l.SlowThreshold && l.SlowThreshold != 0 && l.LogLevel >= logger.Warn: + l.ctx.LogWarnf("[SLOW SQL %.3fms] [rows:%d] %s", float64(elapsed.Nanoseconds())/1e6, rows, sql) + case l.LogLevel >= logger.Info: + l.ctx.LogDebugf("[%.3fms] [rows:%d] %s", float64(elapsed.Nanoseconds())/1e6, rows, sql) + } +} + +// ConvertLogLevel converts project log level to GORM log level +func ConvertLogLevel(isDebug bool) logger.LogLevel { + if isDebug { + return logger.Info // Show SQL queries in debug mode + } + return logger.Silent // Silent in production +} diff --git a/src/database/service/service_test.go b/src/database/service/service_test.go new file mode 100644 index 00000000..64b14367 --- /dev/null +++ b/src/database/service/service_test.go @@ -0,0 +1,208 @@ +package service + +import ( + "context" + "os" + "path/filepath" + "testing" + "time" + + "github.com/Parallels/prl-devops-service/database/common" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func TestDatabaseService_Initialize_SQLite(t *testing.T) { + // Create temporary directory for test database + tempDir := t.TempDir() + + config := common.Config{ + Type: common.SQLite, + Debug: false, + Migrate: true, + SQLite: common.SQLiteConfig{ + StoragePath: tempDir, + FileName: "test.db", + }, + Pool: common.PoolConfig{ + MaxIdleConns: 5, + MaxOpenConns: 10, + ConnMaxLifetime: time.Hour, + }, + } + + // Reset singleton for test + Reset() + + // Initialize database service + dbSvc, err := Initialize(config) + require.NoError(t, err, "Failed to initialize database service") + require.NotNil(t, dbSvc, "Database service should not be nil") + + // Verify database file was created + dbPath := filepath.Join(tempDir, "test.db") + assert.FileExists(t, dbPath, "Database file should exist") + + // Verify service properties + assert.Equal(t, "database", dbSvc.Name()) + assert.True(t, dbSvc.IsEnabled()) + assert.Empty(t, dbSvc.Dependencies()) + + // Cleanup + dbSvc.Close() +} + +func TestDatabaseService_Health(t *testing.T) { + tempDir := t.TempDir() + + config := common.Config{ + Type: common.SQLite, + SQLite: common.SQLiteConfig{ + StoragePath: tempDir, + FileName: "test.db", + }, + Pool: common.DefaultPoolConfig(), + } + + Reset() + dbSvc, err := Initialize(config) + require.NoError(t, err) + defer dbSvc.Close() + + // Health check should pass + err = dbSvc.Health(context.Background()) + assert.NoError(t, err, "Health check should pass for active connection") +} + +func TestDatabaseService_GetDB(t *testing.T) { + tempDir := t.TempDir() + + config := common.Config{ + Type: common.SQLite, + SQLite: common.SQLiteConfig{ + StoragePath: tempDir, + FileName: "test.db", + }, + Pool: common.DefaultPoolConfig(), + } + + Reset() + dbSvc, err := Initialize(config) + require.NoError(t, err) + defer dbSvc.Close() + + // GetDB should return valid connection + db := dbSvc.GetDB() + assert.NotNil(t, db, "GetDB should return valid connection") +} + +func TestDatabaseService_Singleton(t *testing.T) { + tempDir := t.TempDir() + + config := common.Config{ + Type: common.SQLite, + SQLite: common.SQLiteConfig{ + StoragePath: tempDir, + FileName: "test.db", + }, + Pool: common.DefaultPoolConfig(), + } + + Reset() + + // First initialization + dbSvc1, err := Initialize(config) + require.NoError(t, err) + defer dbSvc1.Close() + + // Second initialization should return same instance + dbSvc2, err := Initialize(config) + require.NoError(t, err) + + assert.Same(t, dbSvc1, dbSvc2, "Initialize should return same singleton instance") + assert.Same(t, dbSvc1, GetInstance(), "GetInstance should return same instance") +} + +func TestDatabaseService_InvalidConfig(t *testing.T) { + Reset() + + // Invalid database type + config := common.Config{ + Type: "invalid", + Pool: common.DefaultPoolConfig(), + } + + _, err := Initialize(config) + assert.Error(t, err, "Should fail with invalid database type") +} + +func TestDatabaseService_Close(t *testing.T) { + tempDir := t.TempDir() + + config := common.Config{ + Type: common.SQLite, + SQLite: common.SQLiteConfig{ + StoragePath: tempDir, + FileName: "test.db", + }, + Pool: common.DefaultPoolConfig(), + } + + Reset() + dbSvc, err := Initialize(config) + require.NoError(t, err) + + // Close should succeed + err = dbSvc.Close() + assert.NoError(t, err, "Close should succeed") + + // Health check should fail after close + err = dbSvc.Health(context.Background()) + assert.Error(t, err, "Health check should fail after close") +} + +func TestDatabaseService_ConfigValidation(t *testing.T) { + testCases := []struct { + name string + config common.Config + expectError bool + }{ + { + name: "Valid SQLite config", + config: common.Config{ + Type: common.SQLite, + SQLite: common.SQLiteConfig{ + StoragePath: os.TempDir(), + FileName: "test.db", + }, + Pool: common.DefaultPoolConfig(), + }, + expectError: false, + }, + { + name: "Empty database type", + config: common.Config{ + Type: "", + Pool: common.DefaultPoolConfig(), + }, + expectError: true, + }, + } + + for _, tc := range testCases { + t.Run(tc.name, func(t *testing.T) { + Reset() + _, err := Initialize(tc.config) + if tc.expectError { + assert.Error(t, err) + } else { + if err == nil { + // Cleanup if successful + if svc := GetInstance(); svc != nil { + svc.Close() + } + } + } + }) + } +} diff --git a/src/database/service/sqlite_test.go b/src/database/service/sqlite_test.go new file mode 100644 index 00000000..21dcb2c0 --- /dev/null +++ b/src/database/service/sqlite_test.go @@ -0,0 +1,192 @@ +package service + +import ( + "os" + "path/filepath" + "testing" + + "github.com/Parallels/prl-devops-service/database/common" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "gorm.io/gorm" +) + +func TestInitializeSQLite_Success(t *testing.T) { + tempDir := t.TempDir() + + config := &common.Config{ + Type: common.SQLite, + SQLite: common.SQLiteConfig{ + StoragePath: tempDir, + FileName: "test.db", + }, + Pool: common.DefaultPoolConfig(), + } + + gormConfig := &gorm.Config{} + + db, err := initializeSQLite(config, gormConfig) + require.NoError(t, err, "SQLite initialization should succeed") + require.NotNil(t, db, "Database connection should not be nil") + + // Verify database file exists + dbPath := filepath.Join(tempDir, "test.db") + assert.FileExists(t, dbPath, "Database file should be created") + + // Cleanup + sqlDB, _ := db.DB() + if sqlDB != nil { + sqlDB.Close() + } +} + +func TestInitializeSQLite_CreatesDirectory(t *testing.T) { + tempDir := t.TempDir() + dbDir := filepath.Join(tempDir, "nested", "db", "path") + + config := &common.Config{ + Type: common.SQLite, + SQLite: common.SQLiteConfig{ + StoragePath: dbDir, + FileName: "test.db", + }, + Pool: common.DefaultPoolConfig(), + } + + gormConfig := &gorm.Config{} + + db, err := initializeSQLite(config, gormConfig) + require.NoError(t, err, "Should create nested directories") + require.NotNil(t, db) + + // Verify directory was created + assert.DirExists(t, dbDir, "Nested directory should be created") + + // Cleanup + sqlDB, _ := db.DB() + if sqlDB != nil { + sqlDB.Close() + } +} + +func TestInitializeSQLite_ConnectionPool(t *testing.T) { + tempDir := t.TempDir() + + config := &common.Config{ + Type: common.SQLite, + SQLite: common.SQLiteConfig{ + StoragePath: tempDir, + FileName: "test.db", + }, + Pool: common.PoolConfig{ + MaxIdleConns: 2, + MaxOpenConns: 5, + ConnMaxLifetime: 0, // No limit for test + }, + } + + gormConfig := &gorm.Config{} + + db, err := initializeSQLite(config, gormConfig) + require.NoError(t, err) + require.NotNil(t, db) + + // Verify pool settings were applied + sqlDB, err := db.DB() + require.NoError(t, err) + + stats := sqlDB.Stats() + // SQLite may open an initial connection, so check it's <= MaxOpenConns + assert.LessOrEqual(t, stats.OpenConnections, 5, "Open connections should not exceed MaxOpenConns") + + // Cleanup + sqlDB.Close() +} + +func TestInitializeSQLite_RelativePath(t *testing.T) { + // Create a temporary directory with a relative path + originalWd, _ := os.Getwd() + tempDir := t.TempDir() + os.Chdir(tempDir) + defer os.Chdir(originalWd) + + config := &common.Config{ + Type: common.SQLite, + SQLite: common.SQLiteConfig{ + StoragePath: ".", + FileName: "relative.db", + }, + Pool: common.DefaultPoolConfig(), + } + + gormConfig := &gorm.Config{} + + db, err := initializeSQLite(config, gormConfig) + require.NoError(t, err, "Should handle relative paths") + require.NotNil(t, db) + + // Verify database exists + assert.FileExists(t, "relative.db", "Database should exist in current directory") + + // Cleanup + sqlDB, _ := db.DB() + if sqlDB != nil { + sqlDB.Close() + } +} + +func TestInitializeSQLite_InvalidPath(t *testing.T) { + // Try to create database in non-writable location + config := &common.Config{ + Type: common.SQLite, + SQLite: common.SQLiteConfig{ + StoragePath: "/root/no-permission", + FileName: "test.db", + }, + Pool: common.DefaultPoolConfig(), + } + + gormConfig := &gorm.Config{} + + _, err := initializeSQLite(config, gormConfig) + // On most systems this will fail due to permissions + // But on systems where we have access, it might succeed + // So we just check that it doesn't panic + if err != nil { + t.Logf("Expected error due to permissions: %v", err) + } +} + +func TestEnsureDir(t *testing.T) { + tempDir := t.TempDir() + + testCases := []struct { + name string + path string + expected bool + }{ + { + name: "Create nested directory", + path: filepath.Join(tempDir, "a", "b", "c", "test.db"), + expected: true, + }, + { + name: "Existing directory", + path: filepath.Join(tempDir, "existing.db"), + expected: true, + }, + } + + for _, tc := range testCases { + t.Run(tc.name, func(t *testing.T) { + err := ensureDir(tc.path) + if tc.expected { + assert.NoError(t, err) + dir := filepath.Dir(tc.path) + assert.DirExists(t, dir, "Directory should be created") + } else { + assert.Error(t, err) + } + }) + } +} diff --git a/src/serviceprovider/dbservice/database.go b/src/serviceprovider/dbservice/database.go index e4c3eebb..ea2146ee 100644 --- a/src/serviceprovider/dbservice/database.go +++ b/src/serviceprovider/dbservice/database.go @@ -7,25 +7,13 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/config" "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/common" + "github.com/Parallels/prl-devops-service/database/service" "github.com/Parallels/prl-devops-service/database/stores" apperrors "github.com/Parallels/prl-devops-service/errors" - "gorm.io/driver/sqlite" "gorm.io/gorm" - "gorm.io/gorm/logger" ) -// Helper to convert Diagnostics to error -func diagToError(diag *apperrors.Diagnostics) error { - if !diag.HasErrors() { - return nil - } - errors := diag.GetErrors() - if len(errors) > 0 { - return fmt.Errorf("%s: %s", errors[0].Code, errors[0].Message) - } - return fmt.Errorf("unknown error") -} - // DatabaseService wraps GORM stores and provides a unified interface type DatabaseService struct { db *gorm.DB @@ -36,26 +24,40 @@ type DatabaseService struct { var globalDatabaseService *DatabaseService -// InitDatabase initializes the GORM database and stores +// InitDatabase initializes the GORM database and stores using centralized database/service func InitDatabase(ctx basecontext.ApiContext) (*DatabaseService, error) { if globalDatabaseService != nil { return globalDatabaseService, nil } cfg := config.Get() - dbPath := "data/database.db" - if cfg.DatabaseFolder() != "" { - dbPath = cfg.DatabaseFolder() + "/database.db" - } - // Open database - db, err := gorm.Open(sqlite.Open(dbPath), &gorm.Config{ - Logger: logger.Default.LogMode(logger.Silent), - }) + // Build database configuration from app config + dbConfig := buildDatabaseConfig(cfg) + + // Initialize centralized database service + dbSvc, err := service.Initialize(dbConfig) if err != nil { - return nil, err + return nil, fmt.Errorf("failed to initialize database service: %w", err) + } + + // Verify database health + if err := dbSvc.Health(context.Background()); err != nil { + ctx.LogErrorf("Database health check failed: %v", err) + return nil, fmt.Errorf("database health check failed: %w", err) } + // Get the database connection from centralized service + db := dbSvc.GetDB() + if db == nil { + return nil, fmt.Errorf("database connection is nil") + } + + // Apply custom logger that bridges GORM logs to basecontext + logLevel := service.ConvertLogLevel(cfg.IsDebugEnabled()) + customLogger := service.NewBaseContextLogger(ctx, logLevel) + db.Logger = customLogger + // Auto-migrate if err := db.AutoMigrate( &models.User{}, @@ -93,31 +95,79 @@ func InitDatabase(ctx basecontext.ApiContext) (*DatabaseService, error) { claimStore: claimStore, } - ctx.LogInfof("Database initialized at %s", dbPath) + ctx.LogInfof("Database initialized successfully (type: %s)", dbConfig.Type) return globalDatabaseService, nil } +// buildDatabaseConfig converts app config to database common.Config +func buildDatabaseConfig(cfg *config.Config) common.Config { + // Read database type from config (sqlite or postgresql) + dbType := cfg.DatabaseType() + + dbConfig := common.Config{ + Type: common.DatabaseType(dbType), + Debug: cfg.IsDebugEnabled(), // Use app's log level + Migrate: cfg.IsDatabaseAutoMigrateEnabled(), + Pool: common.DefaultPoolConfig(), + } + + // Configure based on database type + switch dbConfig.Type { + case common.SQLite: + dbPath := "data" + if cfg.DatabaseFolder() != "" { + dbPath = cfg.DatabaseFolder() + } + dbConfig.SQLite = common.SQLiteConfig{ + StoragePath: dbPath, + FileName: "database.db", + } + + case common.PostgreSQL: + // Configure PostgreSQL from environment variables + dbConfig.PostgreSQL = common.PostgreSQLConfig{ + Host: cfg.GetKey("DATABASE_HOST"), + Port: cfg.GetIntKey("DATABASE_PORT"), + Database: cfg.GetKey("DATABASE_NAME"), + Username: cfg.GetKey("DATABASE_USERNAME"), + Password: cfg.GetKey("DATABASE_PASSWORD"), + SSLMode: cfg.GetBoolKey("DATABASE_SSL_MODE"), + } + // Apply defaults if not set + if dbConfig.PostgreSQL.Host == "" { + dbConfig.PostgreSQL.Host = "localhost" + } + if dbConfig.PostgreSQL.Port == 0 { + dbConfig.PostgreSQL.Port = 5432 + } + if dbConfig.PostgreSQL.Database == "" { + dbConfig.PostgreSQL.Database = "prl_devops" + } + if dbConfig.PostgreSQL.Username == "" { + dbConfig.PostgreSQL.Username = "postgres" + } + } + + return dbConfig +} + // GetDatabaseService returns the global database service instance func GetDatabaseService() *DatabaseService { return globalDatabaseService } // User operations -func (s *DatabaseService) GetUsers(ctx basecontext.ApiContext, filter string) ([]models.User, error) { +func (s *DatabaseService) GetUsers(ctx basecontext.ApiContext, filter string) ([]models.User, *apperrors.Diagnostics) { // Cast to basecontext.BaseContext since stores expect that type baseCtx, ok := ctx.(*basecontext.BaseContext) if !ok { baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) } - users, diag := s.userStore.GetUsers(*baseCtx) - if diag.HasErrors() { - return nil, diagToError(diag) - } - return users, nil + return s.userStore.GetUsers(*baseCtx) } -func (s *DatabaseService) GetUser(ctx basecontext.ApiContext, idOrEmail string) (*models.User, error) { +func (s *DatabaseService) GetUser(ctx basecontext.ApiContext, idOrEmail string) (*models.User, *apperrors.Diagnostics) { baseCtx, ok := ctx.(*basecontext.BaseContext) if !ok { baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) @@ -132,198 +182,144 @@ func (s *DatabaseService) GetUser(ctx basecontext.ApiContext, idOrEmail string) // Try by username user, diag = s.userStore.GetUserByUsername(*baseCtx, idOrEmail) if diag != nil && diag.HasErrors() { - return nil, diagToError(diag) + return nil, diag } if user == nil { - return nil, fmt.Errorf("user not found: %s", idOrEmail) + diag = apperrors.NewDiagnostics("get_user") + diag.AddError("user_not_found", fmt.Sprintf("user not found: %s", idOrEmail), "dbservice", nil) + return nil, diag } return user, nil } -func (s *DatabaseService) CreateUser(ctx basecontext.ApiContext, user models.User) (*models.User, error) { +func (s *DatabaseService) CreateUser(ctx basecontext.ApiContext, user models.User) (*models.User, *apperrors.Diagnostics) { baseCtx, ok := ctx.(*basecontext.BaseContext) if !ok { baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) } - created, diag := s.userStore.CreateUser(*baseCtx, &user) - if diag.HasErrors() { - return nil, diagToError(diag) - } - return created, nil + return s.userStore.CreateUser(*baseCtx, &user) } -func (s *DatabaseService) UpdateUser(ctx basecontext.ApiContext, user *models.User) error { +func (s *DatabaseService) UpdateUser(ctx basecontext.ApiContext, user *models.User) *apperrors.Diagnostics { baseCtx, ok := ctx.(*basecontext.BaseContext) if !ok { baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) } - diag := s.userStore.UpdateUser(*baseCtx, user) - if diag.HasErrors() { - return diagToError(diag) - } - return nil + return s.userStore.UpdateUser(*baseCtx, user) } -func (s *DatabaseService) DeleteUser(ctx basecontext.ApiContext, id string) error { +func (s *DatabaseService) DeleteUser(ctx basecontext.ApiContext, id string) *apperrors.Diagnostics { baseCtx, ok := ctx.(*basecontext.BaseContext) if !ok { baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) } - diag := s.userStore.DeleteUser(*baseCtx, id) - if diag.HasErrors() { - return diagToError(diag) - } - return nil + return s.userStore.DeleteUser(*baseCtx, id) } -func (s *DatabaseService) UpdateUserPassword(ctx basecontext.ApiContext, id string, password string) error { +func (s *DatabaseService) UpdateUserPassword(ctx basecontext.ApiContext, id string, password string) *apperrors.Diagnostics { baseCtx, ok := ctx.(*basecontext.BaseContext) if !ok { baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) } - diag := s.userStore.UpdateUserPassword(*baseCtx, id, password) - if diag.HasErrors() { - return diagToError(diag) - } - return nil + return s.userStore.UpdateUserPassword(*baseCtx, id, password) } // Role operations -func (s *DatabaseService) GetUserRoles(ctx basecontext.ApiContext, userId string) ([]models.Role, error) { +func (s *DatabaseService) GetUserRoles(ctx basecontext.ApiContext, userId string) ([]models.Role, *apperrors.Diagnostics) { baseCtx, ok := ctx.(*basecontext.BaseContext) if !ok { baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) } - roles, diag := s.userStore.GetUserRoles(*baseCtx, userId) - if diag.HasErrors() { - return nil, diagToError(diag) - } - return roles, nil + return s.userStore.GetUserRoles(*baseCtx, userId) } -func (s *DatabaseService) AddUserToRole(ctx basecontext.ApiContext, userId string, roleId string) error { +func (s *DatabaseService) AddUserToRole(ctx basecontext.ApiContext, userId string, roleId string) *apperrors.Diagnostics { baseCtx, ok := ctx.(*basecontext.BaseContext) if !ok { baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) } - diag := s.userStore.AddUserToRole(*baseCtx, userId, roleId) - if diag.HasErrors() { - return diagToError(diag) - } - return nil + return s.userStore.AddUserToRole(*baseCtx, userId, roleId) } -func (s *DatabaseService) RemoveRoleFromUser(ctx basecontext.ApiContext, userId string, roleId string) error { +func (s *DatabaseService) RemoveRoleFromUser(ctx basecontext.ApiContext, userId string, roleId string) *apperrors.Diagnostics { baseCtx, ok := ctx.(*basecontext.BaseContext) if !ok { baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) } - diag := s.userStore.RemoveUserFromRole(*baseCtx, userId, roleId) - if diag.HasErrors() { - return diagToError(diag) - } - return nil + return s.userStore.RemoveUserFromRole(*baseCtx, userId, roleId) } // Claim operations -func (s *DatabaseService) GetUserClaims(ctx basecontext.ApiContext, userId string) ([]models.Claim, error) { +func (s *DatabaseService) GetUserClaims(ctx basecontext.ApiContext, userId string) ([]models.Claim, *apperrors.Diagnostics) { baseCtx, ok := ctx.(*basecontext.BaseContext) if !ok { baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) } - claims, diag := s.userStore.GetUserClaims(*baseCtx, userId) - if diag.HasErrors() { - return nil, diagToError(diag) - } - return claims, nil + return s.userStore.GetUserClaims(*baseCtx, userId) } -func (s *DatabaseService) AddClaimToUser(ctx basecontext.ApiContext, userId string, claimId string) error { +func (s *DatabaseService) AddClaimToUser(ctx basecontext.ApiContext, userId string, claimId string) *apperrors.Diagnostics { baseCtx, ok := ctx.(*basecontext.BaseContext) if !ok { baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) } - diag := s.userStore.AddClaimToUser(*baseCtx, userId, claimId) - if diag.HasErrors() { - return diagToError(diag) - } - return nil + return s.userStore.AddClaimToUser(*baseCtx, userId, claimId) } -func (s *DatabaseService) RemoveClaimFromUser(ctx basecontext.ApiContext, userId string, claimId string) error { +func (s *DatabaseService) RemoveClaimFromUser(ctx basecontext.ApiContext, userId string, claimId string) *apperrors.Diagnostics { baseCtx, ok := ctx.(*basecontext.BaseContext) if !ok { baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) } - diag := s.userStore.RemoveClaimFromUser(*baseCtx, userId, claimId) - if diag.HasErrors() { - return diagToError(diag) - } - return nil + return s.userStore.RemoveClaimFromUser(*baseCtx, userId, claimId) } // Role CRUD -func (s *DatabaseService) GetRoles(ctx basecontext.ApiContext, filter string) ([]models.Role, error) { +func (s *DatabaseService) GetRoles(ctx basecontext.ApiContext, filter string) ([]models.Role, *apperrors.Diagnostics) { baseCtx, ok := ctx.(*basecontext.BaseContext) if !ok { baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) } - roles, diag := s.roleStore.GetRoles(*baseCtx) - if diag.HasErrors() { - return nil, diagToError(diag) - } - return roles, nil + return s.roleStore.GetRoles(*baseCtx) } -func (s *DatabaseService) GetRole(ctx basecontext.ApiContext, idOrName string) (*models.Role, error) { +func (s *DatabaseService) GetRole(ctx basecontext.ApiContext, idOrName string) (*models.Role, *apperrors.Diagnostics) { baseCtx, ok := ctx.(*basecontext.BaseContext) if !ok { baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) } - role, diag := s.roleStore.GetRoleBySlugOrID(*baseCtx, idOrName) - if diag.HasErrors() { - return nil, diagToError(diag) - } - return role, nil + return s.roleStore.GetRoleBySlugOrID(*baseCtx, idOrName) } // Claim CRUD -func (s *DatabaseService) GetClaims(ctx basecontext.ApiContext, filter string) ([]models.Claim, error) { +func (s *DatabaseService) GetClaims(ctx basecontext.ApiContext, filter string) ([]models.Claim, *apperrors.Diagnostics) { baseCtx, ok := ctx.(*basecontext.BaseContext) if !ok { baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) } - claims, diag := s.claimStore.GetClaims(*baseCtx) - if diag.HasErrors() { - return nil, diagToError(diag) - } - return claims, nil + return s.claimStore.GetClaims(*baseCtx) } -func (s *DatabaseService) GetClaim(ctx basecontext.ApiContext, idOrName string) (*models.Claim, error) { +func (s *DatabaseService) GetClaim(ctx basecontext.ApiContext, idOrName string) (*models.Claim, *apperrors.Diagnostics) { baseCtx, ok := ctx.(*basecontext.BaseContext) if !ok { baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) } - claim, diag := s.claimStore.GetClaimByNameOrID(*baseCtx, idOrName) - if diag.HasErrors() { - return nil, diagToError(diag) - } - return claim, nil + return s.claimStore.GetClaimByNameOrID(*baseCtx, idOrName) } // Connect is a no-op for compatibility with JsonDatabase interface From cb8fc46e6a8910c53de2b1734cdf2082580283cc Mon Sep 17 00:00:00 2001 From: Sai Kumar P Date: Fri, 10 Jul 2026 15:54:04 +0200 Subject: [PATCH 2/5] feat: Introduce new database service builder and refactor existing database initialization logic --- src/serviceprovider/data.go | 7 +- src/serviceprovider/dbservice/builder.go | 175 +++++++++ src/serviceprovider/dbservice/database.go | 365 ++++-------------- .../dbservice/domains/auth/service.go | 74 ++++ .../dbservice/interfaces/domains.go | 19 + .../dbservice/store_registry.go | 68 ++++ 6 files changed, 409 insertions(+), 299 deletions(-) create mode 100644 src/serviceprovider/dbservice/builder.go create mode 100644 src/serviceprovider/dbservice/domains/auth/service.go create mode 100644 src/serviceprovider/dbservice/interfaces/domains.go create mode 100644 src/serviceprovider/dbservice/store_registry.go diff --git a/src/serviceprovider/data.go b/src/serviceprovider/data.go index fdc9d267..44ab89c9 100644 --- a/src/serviceprovider/data.go +++ b/src/serviceprovider/data.go @@ -3,15 +3,18 @@ package serviceprovider import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/data" + apperrors "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/serviceprovider/dbservice" ) // GetDatabaseService returns the GORM-based database service // This is the new implementation using database stores -func GetDatabaseService(ctx basecontext.ApiContext) (*dbservice.DatabaseService, error) { +func GetDatabaseService(ctx basecontext.ApiContext) (*dbservice.DatabaseService, *apperrors.Diagnostics) { db := dbservice.GetDatabaseService() if db == nil { - return nil, data.ErrDatabaseNotConnected + diag := apperrors.NewDiagnostics("get_database_service") + diag.AddError("not_connected", "database not connected - call InitDatabase first", "serviceprovider", nil) + return nil, diag } return db, nil } diff --git a/src/serviceprovider/dbservice/builder.go b/src/serviceprovider/dbservice/builder.go new file mode 100644 index 00000000..f9f4057d --- /dev/null +++ b/src/serviceprovider/dbservice/builder.go @@ -0,0 +1,175 @@ +package dbservice + +import ( + "context" + "fmt" + + "github.com/Parallels/prl-devops-service/basecontext" + "github.com/Parallels/prl-devops-service/config" + "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/common" + "github.com/Parallels/prl-devops-service/database/service" + apperrors "github.com/Parallels/prl-devops-service/errors" + "gorm.io/gorm" +) + +// Builder provides a fluent interface for constructing a DatabaseService +type Builder struct { + cfg *config.Config + ctx basecontext.ApiContext + skipMigration bool + skipHealthCheck bool + customModels []interface{} +} + +// NewBuilder creates a new DatabaseService builder +func NewBuilder(cfg *config.Config, ctx basecontext.ApiContext) *Builder { + return &Builder{ + cfg: cfg, + ctx: ctx, + } +} + +// SkipMigration disables auto-migration during initialization +func (b *Builder) SkipMigration() *Builder { + b.skipMigration = true + return b +} + +// SkipHealthCheck disables health check during initialization +func (b *Builder) SkipHealthCheck() *Builder { + b.skipHealthCheck = true + return b +} + +// WithModels adds custom models for auto-migration +func (b *Builder) WithModels(models ...interface{}) *Builder { + b.customModels = append(b.customModels, models...) + return b +} + +// Build constructs and initializes the DatabaseService +func (b *Builder) Build() (*DatabaseService, *apperrors.Diagnostics) { + diag := apperrors.NewDiagnostics("database_builder") + + // Step 1: Build database configuration + dbConfig := buildDatabaseConfig(b.cfg) + + // Step 2: Initialize centralized database service + dbSvc, err := service.Initialize(dbConfig) + if err != nil { + diag.AddError("db_init_failed", fmt.Sprintf("failed to initialize database service: %v", err), "builder", nil) + return nil, diag + } + + db := dbSvc.GetDB() + if db == nil { + diag.AddError("db_nil", "database connection is nil", "builder", nil) + return nil, diag + } + + // Step 3: Health check (optional) + if !b.skipHealthCheck { + if err := dbSvc.Health(context.Background()); err != nil { + diag.AddError("health_check_failed", fmt.Sprintf("database health check failed: %v", err), "builder", nil) + b.ctx.LogErrorf("Database health check failed: %v", err) + return nil, diag + } + } + + // Step 4: Configure logger + logLevel := service.ConvertLogLevel(b.cfg.IsDebugEnabled()) + customLogger := service.NewBaseContextLogger(b.ctx, logLevel) + db.Logger = customLogger + + // Step 5: Auto-migrate (optional) + if !b.skipMigration { + if err := b.migrate(db); err != nil { + diag.AddError("migration_failed", fmt.Sprintf("auto-migration failed: %v", err), "builder", nil) + return nil, diag + } + } + + // Step 6: Initialize store registry + stores, err := NewStoreRegistry(db) + if err != nil { + diag.AddError("store_init_failed", fmt.Sprintf("failed to initialize stores: %v", err), "builder", nil) + return nil, diag + } + + // Step 7: Create database service + dbService := &DatabaseService{ + db: db, + stores: stores, + } + + b.ctx.LogInfof("Database initialized successfully (type: %s)", dbConfig.Type) + return dbService, nil +} + +// migrate runs auto-migration for all models +func (b *Builder) migrate(db *gorm.DB) error { + // Default models + models := []interface{}{ + &models.User{}, + &models.Role{}, + &models.Claim{}, + &models.ApiKey{}, + &models.Configuration{}, + &models.Activity{}, + } + + // Add custom models + models = append(models, b.customModels...) + + return db.AutoMigrate(models...) +} + +// buildDatabaseConfig converts app config to database common.Config +func buildDatabaseConfig(cfg *config.Config) common.Config { + dbType := cfg.DatabaseType() + + dbConfig := common.Config{ + Type: common.DatabaseType(dbType), + Debug: cfg.IsDebugEnabled(), + Migrate: cfg.IsDatabaseAutoMigrateEnabled(), + Pool: common.DefaultPoolConfig(), + } + + switch dbConfig.Type { + case common.SQLite: + dbPath := "data" + if cfg.DatabaseFolder() != "" { + dbPath = cfg.DatabaseFolder() + } + dbConfig.SQLite = common.SQLiteConfig{ + StoragePath: dbPath, + FileName: "database.db", + } + + case common.PostgreSQL: + dbConfig.PostgreSQL = common.PostgreSQLConfig{ + Host: cfg.GetKey("DATABASE_HOST"), + Port: cfg.GetIntKey("DATABASE_PORT"), + Database: cfg.GetKey("DATABASE_NAME"), + Username: cfg.GetKey("DATABASE_USERNAME"), + Password: cfg.GetKey("DATABASE_PASSWORD"), + SSLMode: cfg.GetBoolKey("DATABASE_SSL_MODE"), + } + // Apply defaults + if dbConfig.PostgreSQL.Host == "" { + dbConfig.PostgreSQL.Host = "localhost" + } + if dbConfig.PostgreSQL.Port == 0 { + dbConfig.PostgreSQL.Port = 5432 + } + if dbConfig.PostgreSQL.Database == "" { + dbConfig.PostgreSQL.Database = "prl_devops" + } + if dbConfig.PostgreSQL.Username == "" { + dbConfig.PostgreSQL.Username = "postgres" + } + } + + return dbConfig +} diff --git a/src/serviceprovider/dbservice/database.go b/src/serviceprovider/dbservice/database.go index ea2146ee..4df59cbe 100644 --- a/src/serviceprovider/dbservice/database.go +++ b/src/serviceprovider/dbservice/database.go @@ -1,333 +1,104 @@ package dbservice import ( - "context" - "fmt" + "sync" "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/config" - "github.com/Parallels/prl-devops-service/data/models" - "github.com/Parallels/prl-devops-service/database/common" - "github.com/Parallels/prl-devops-service/database/service" - "github.com/Parallels/prl-devops-service/database/stores" apperrors "github.com/Parallels/prl-devops-service/errors" + "github.com/Parallels/prl-devops-service/serviceprovider/dbservice/domains/auth" + "github.com/Parallels/prl-devops-service/serviceprovider/dbservice/interfaces" "gorm.io/gorm" ) -// DatabaseService wraps GORM stores and provides a unified interface -type DatabaseService struct { - db *gorm.DB - userStore stores.UserDataStoreInterface - roleStore stores.RoleDataStoreInterface - claimStore stores.ClaimDataStoreInterface -} - -var globalDatabaseService *DatabaseService - -// InitDatabase initializes the GORM database and stores using centralized database/service -func InitDatabase(ctx basecontext.ApiContext) (*DatabaseService, error) { - if globalDatabaseService != nil { - return globalDatabaseService, nil - } - - cfg := config.Get() - - // Build database configuration from app config - dbConfig := buildDatabaseConfig(cfg) - - // Initialize centralized database service - dbSvc, err := service.Initialize(dbConfig) - if err != nil { - return nil, fmt.Errorf("failed to initialize database service: %w", err) - } - - // Verify database health - if err := dbSvc.Health(context.Background()); err != nil { - ctx.LogErrorf("Database health check failed: %v", err) - return nil, fmt.Errorf("database health check failed: %w", err) - } - - // Get the database connection from centralized service - db := dbSvc.GetDB() - if db == nil { - return nil, fmt.Errorf("database connection is nil") - } - - // Apply custom logger that bridges GORM logs to basecontext - logLevel := service.ConvertLogLevel(cfg.IsDebugEnabled()) - customLogger := service.NewBaseContextLogger(ctx, logLevel) - db.Logger = customLogger - - // Auto-migrate - if err := db.AutoMigrate( - &models.User{}, - &models.Role{}, - &models.Claim{}, - &models.ApiKey{}, - &models.Configuration{}, - &models.Activity{}, - ); err != nil { - return nil, err - } - - // Initialize stores - stdCtx := context.Background() - - userStore := stores.GetUserDataStoreInstance() - if err := userStore.Init(stdCtx, db); err != nil { - return nil, err - } - - roleStore := stores.GetRoleDataStoreInstance() - if err := roleStore.Init(stdCtx, db); err != nil { - return nil, err - } - - claimStore := stores.GetClaimDataStoreInstance() - if err := claimStore.Init(stdCtx, db); err != nil { - return nil, err - } - - globalDatabaseService = &DatabaseService{ - db: db, - userStore: userStore, - roleStore: roleStore, - claimStore: claimStore, - } - - ctx.LogInfof("Database initialized successfully (type: %s)", dbConfig.Type) - return globalDatabaseService, nil -} - -// buildDatabaseConfig converts app config to database common.Config -func buildDatabaseConfig(cfg *config.Config) common.Config { - // Read database type from config (sqlite or postgresql) - dbType := cfg.DatabaseType() - - dbConfig := common.Config{ - Type: common.DatabaseType(dbType), - Debug: cfg.IsDebugEnabled(), // Use app's log level - Migrate: cfg.IsDatabaseAutoMigrateEnabled(), - Pool: common.DefaultPoolConfig(), - } - - // Configure based on database type - switch dbConfig.Type { - case common.SQLite: - dbPath := "data" - if cfg.DatabaseFolder() != "" { - dbPath = cfg.DatabaseFolder() - } - dbConfig.SQLite = common.SQLiteConfig{ - StoragePath: dbPath, - FileName: "database.db", - } - - case common.PostgreSQL: - // Configure PostgreSQL from environment variables - dbConfig.PostgreSQL = common.PostgreSQLConfig{ - Host: cfg.GetKey("DATABASE_HOST"), - Port: cfg.GetIntKey("DATABASE_PORT"), - Database: cfg.GetKey("DATABASE_NAME"), - Username: cfg.GetKey("DATABASE_USERNAME"), - Password: cfg.GetKey("DATABASE_PASSWORD"), - SSLMode: cfg.GetBoolKey("DATABASE_SSL_MODE"), - } - // Apply defaults if not set - if dbConfig.PostgreSQL.Host == "" { - dbConfig.PostgreSQL.Host = "localhost" - } - if dbConfig.PostgreSQL.Port == 0 { - dbConfig.PostgreSQL.Port = 5432 - } - if dbConfig.PostgreSQL.Database == "" { - dbConfig.PostgreSQL.Database = "prl_devops" - } - if dbConfig.PostgreSQL.Username == "" { - dbConfig.PostgreSQL.Username = "postgres" - } - } - - return dbConfig -} - -// GetDatabaseService returns the global database service instance -func GetDatabaseService() *DatabaseService { - return globalDatabaseService -} - -// User operations -func (s *DatabaseService) GetUsers(ctx basecontext.ApiContext, filter string) ([]models.User, *apperrors.Diagnostics) { - // Cast to basecontext.BaseContext since stores expect that type - baseCtx, ok := ctx.(*basecontext.BaseContext) - if !ok { - baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) - } - - return s.userStore.GetUsers(*baseCtx) -} - -func (s *DatabaseService) GetUser(ctx basecontext.ApiContext, idOrEmail string) (*models.User, *apperrors.Diagnostics) { - baseCtx, ok := ctx.(*basecontext.BaseContext) - if !ok { - baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) - } - - // Try by ID first - user, diag := s.userStore.GetUserByID(*baseCtx, idOrEmail) - if diag != nil && !diag.HasErrors() && user != nil { - return user, nil - } - - // Try by username - user, diag = s.userStore.GetUserByUsername(*baseCtx, idOrEmail) - if diag != nil && diag.HasErrors() { - return nil, diag - } - if user == nil { - diag = apperrors.NewDiagnostics("get_user") - diag.AddError("user_not_found", fmt.Sprintf("user not found: %s", idOrEmail), "dbservice", nil) - return nil, diag - } - return user, nil -} - -func (s *DatabaseService) CreateUser(ctx basecontext.ApiContext, user models.User) (*models.User, *apperrors.Diagnostics) { - baseCtx, ok := ctx.(*basecontext.BaseContext) - if !ok { - baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) - } - - return s.userStore.CreateUser(*baseCtx, &user) -} - -func (s *DatabaseService) UpdateUser(ctx basecontext.ApiContext, user *models.User) *apperrors.Diagnostics { - baseCtx, ok := ctx.(*basecontext.BaseContext) - if !ok { - baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) - } - - return s.userStore.UpdateUser(*baseCtx, user) -} - -func (s *DatabaseService) DeleteUser(ctx basecontext.ApiContext, id string) *apperrors.Diagnostics { - baseCtx, ok := ctx.(*basecontext.BaseContext) - if !ok { - baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) - } - - return s.userStore.DeleteUser(*baseCtx, id) -} - -func (s *DatabaseService) UpdateUserPassword(ctx basecontext.ApiContext, id string, password string) *apperrors.Diagnostics { - baseCtx, ok := ctx.(*basecontext.BaseContext) - if !ok { - baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) - } - - return s.userStore.UpdateUserPassword(*baseCtx, id, password) -} +var ( + globalDatabaseService *DatabaseService + dbMutex sync.RWMutex +) -// Role operations -func (s *DatabaseService) GetUserRoles(ctx basecontext.ApiContext, userId string) ([]models.Role, *apperrors.Diagnostics) { - baseCtx, ok := ctx.(*basecontext.BaseContext) - if !ok { - baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) - } +// DatabaseService provides domain-oriented database operations +type DatabaseService struct { + db *gorm.DB + stores *StoreRegistry - return s.userStore.GetUserRoles(*baseCtx, userId) + // Domain services with lazy initialization + authOnce sync.Once + auth interfaces.AuthDomain } -func (s *DatabaseService) AddUserToRole(ctx basecontext.ApiContext, userId string, roleId string) *apperrors.Diagnostics { - baseCtx, ok := ctx.(*basecontext.BaseContext) - if !ok { - baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) - } - - return s.userStore.AddUserToRole(*baseCtx, userId, roleId) +// NewDatabaseService creates a new database service using the builder pattern +func NewDatabaseService(cfg *config.Config, ctx basecontext.ApiContext) (*DatabaseService, *apperrors.Diagnostics) { + return NewBuilder(cfg, ctx).Build() } -func (s *DatabaseService) RemoveRoleFromUser(ctx basecontext.ApiContext, userId string, roleId string) *apperrors.Diagnostics { - baseCtx, ok := ctx.(*basecontext.BaseContext) - if !ok { - baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) - } - - return s.userStore.RemoveUserFromRole(*baseCtx, userId, roleId) +// Auth returns the authentication domain service (lazy-loaded) +func (s *DatabaseService) Auth() interfaces.AuthDomain { + s.authOnce.Do(func() { + s.auth = auth.NewService( + s.stores.User(), + s.stores.Role(), + s.stores.Claim(), + ) + }) + return s.auth } -// Claim operations -func (s *DatabaseService) GetUserClaims(ctx basecontext.ApiContext, userId string) ([]models.Claim, *apperrors.Diagnostics) { - baseCtx, ok := ctx.(*basecontext.BaseContext) - if !ok { - baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) - } - - return s.userStore.GetUserClaims(*baseCtx, userId) +// WithTransaction executes fn within a database transaction +// If fn returns an error, the transaction is rolled back +// If fn returns nil, the transaction is committed +func (s *DatabaseService) WithTransaction(ctx basecontext.ApiContext, fn func(tx *gorm.DB) error) error { + return s.db.WithContext(ctx.Context()).Transaction(fn) } -func (s *DatabaseService) AddClaimToUser(ctx basecontext.ApiContext, userId string, claimId string) *apperrors.Diagnostics { - baseCtx, ok := ctx.(*basecontext.BaseContext) - if !ok { - baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) - } - - return s.userStore.AddClaimToUser(*baseCtx, userId, claimId) +// DB returns the underlying database connection (use with caution) +func (s *DatabaseService) DB() *gorm.DB { + return s.db } -func (s *DatabaseService) RemoveClaimFromUser(ctx basecontext.ApiContext, userId string, claimId string) *apperrors.Diagnostics { - baseCtx, ok := ctx.(*basecontext.BaseContext) - if !ok { - baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) - } - - return s.userStore.RemoveClaimFromUser(*baseCtx, userId, claimId) +// Stores returns the store registry +func (s *DatabaseService) Stores() *StoreRegistry { + return s.stores } -// Role CRUD -func (s *DatabaseService) GetRoles(ctx basecontext.ApiContext, filter string) ([]models.Role, *apperrors.Diagnostics) { - baseCtx, ok := ctx.(*basecontext.BaseContext) - if !ok { - baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) - } - - return s.roleStore.GetRoles(*baseCtx) +// IsConnected returns true if database is initialized +func (s *DatabaseService) IsConnected() bool { + return s != nil && s.db != nil } -func (s *DatabaseService) GetRole(ctx basecontext.ApiContext, idOrName string) (*models.Role, *apperrors.Diagnostics) { - baseCtx, ok := ctx.(*basecontext.BaseContext) - if !ok { - baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) - } - - return s.roleStore.GetRoleBySlugOrID(*baseCtx, idOrName) -} +// InitDatabase initializes the global database service +// This should be called once during application startup +func InitDatabase(ctx basecontext.ApiContext) (*DatabaseService, *apperrors.Diagnostics) { + dbMutex.Lock() + defer dbMutex.Unlock() -// Claim CRUD -func (s *DatabaseService) GetClaims(ctx basecontext.ApiContext, filter string) ([]models.Claim, *apperrors.Diagnostics) { - baseCtx, ok := ctx.(*basecontext.BaseContext) - if !ok { - baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) + if globalDatabaseService != nil { + ctx.LogDebugf("Database service already initialized") + return globalDatabaseService, nil } - return s.claimStore.GetClaims(*baseCtx) -} - -func (s *DatabaseService) GetClaim(ctx basecontext.ApiContext, idOrName string) (*models.Claim, *apperrors.Diagnostics) { - baseCtx, ok := ctx.(*basecontext.BaseContext) - if !ok { - baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) + cfg := config.Get() + db, diag := NewDatabaseService(cfg, ctx) + if diag != nil && diag.HasErrors() { + ctx.LogErrorf("Failed to initialize database service: %v", diag.GetErrors()) + return nil, diag } - return s.claimStore.GetClaimByNameOrID(*baseCtx, idOrName) + globalDatabaseService = db + ctx.LogInfof("Database service initialized successfully") + return db, nil } -// Connect is a no-op for compatibility with JsonDatabase interface -func (s *DatabaseService) Connect(ctx basecontext.ApiContext) error { - return nil +// GetDatabaseService returns the global database service instance +// Returns nil if InitDatabase has not been called +func GetDatabaseService() *DatabaseService { + dbMutex.RLock() + defer dbMutex.RUnlock() + return globalDatabaseService } -// IsConnected returns true if database is initialized -func (s *DatabaseService) IsConnected() bool { - return s != nil && s.db != nil +// ResetDatabaseService clears the global instance (for testing only) +func ResetDatabaseService() { + dbMutex.Lock() + defer dbMutex.Unlock() + globalDatabaseService = nil } diff --git a/src/serviceprovider/dbservice/domains/auth/service.go b/src/serviceprovider/dbservice/domains/auth/service.go new file mode 100644 index 00000000..6d0bd582 --- /dev/null +++ b/src/serviceprovider/dbservice/domains/auth/service.go @@ -0,0 +1,74 @@ +package auth + +import ( + "fmt" + + "github.com/Parallels/prl-devops-service/basecontext" + "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/stores" + apperrors "github.com/Parallels/prl-devops-service/errors" + "github.com/Parallels/prl-devops-service/serviceprovider/dbservice/interfaces" +) + +// Compile-time interface compliance check +var _ interfaces.AuthDomain = (*Service)(nil) + +// Service handles authentication and authorization domain operations with business logic +// For simple CRUD operations, use db.Stores() directly instead of adding pass-through methods here +type Service struct { + userStore stores.UserDataStoreInterface + roleStore stores.RoleDataStoreInterface + claimStore stores.ClaimDataStoreInterface +} + +// NewService creates a new auth domain service +func NewService( + userStore stores.UserDataStoreInterface, + roleStore stores.RoleDataStoreInterface, + claimStore stores.ClaimDataStoreInterface, +) *Service { + return &Service{ + userStore: userStore, + roleStore: roleStore, + claimStore: claimStore, + } +} + +// toBaseContext converts ApiContext to BaseContext +func toBaseContext(ctx basecontext.ApiContext) *basecontext.BaseContext { + baseCtx, ok := ctx.(*basecontext.BaseContext) + if !ok { + baseCtx = basecontext.NewBaseContextFromContext(ctx.Context()) + } + return baseCtx +} + +// GetUser retrieves a user by ID or username with smart fallback logic +// This method adds value by trying multiple lookup strategies +func (s *Service) GetUser(ctx basecontext.ApiContext, idOrEmail string) (*models.User, *apperrors.Diagnostics) { + baseCtx := toBaseContext(ctx) + + // Try by ID first + user, diag := s.userStore.GetUserByID(*baseCtx, idOrEmail) + if diag != nil && !diag.HasErrors() && user != nil { + return user, nil + } + + // Try by username + user, diag = s.userStore.GetUserByUsername(*baseCtx, idOrEmail) + if diag != nil && diag.HasErrors() { + return nil, diag + } + if user == nil { + diag = apperrors.NewDiagnostics("get_user") + diag.AddError("user_not_found", fmt.Sprintf("user not found: %s", idOrEmail), "auth_service", nil) + return nil, diag + } + return user, nil +} + +// Future business logic methods go here: +// - RegisterUser(ctx, email, password) - create user + send welcome email + audit log +// - LoginUser(ctx, username, password) - validate + create session + log access +// - PromoteToAdmin(ctx, userId) - assign admin role + claims + send notification +// - etc. diff --git a/src/serviceprovider/dbservice/interfaces/domains.go b/src/serviceprovider/dbservice/interfaces/domains.go new file mode 100644 index 00000000..0519a6c9 --- /dev/null +++ b/src/serviceprovider/dbservice/interfaces/domains.go @@ -0,0 +1,19 @@ +package interfaces + +import ( + "github.com/Parallels/prl-devops-service/basecontext" + "github.com/Parallels/prl-devops-service/data/models" + apperrors "github.com/Parallels/prl-devops-service/errors" +) + +// AuthDomain defines authentication and authorization operations with business logic +// For simple CRUD operations, use db.Stores() directly +type AuthDomain interface { + // GetUser retrieves a user by ID or username with smart fallback logic + GetUser(ctx basecontext.ApiContext, idOrEmail string) (*models.User, *apperrors.Diagnostics) + + // Add future business logic methods here: + // RegisterUser - create user + send welcome email + audit + // LoginUser - validate credentials + create session + log + // PromoteToAdmin - assign role + claims + notify +} diff --git a/src/serviceprovider/dbservice/store_registry.go b/src/serviceprovider/dbservice/store_registry.go new file mode 100644 index 00000000..7fe4a58d --- /dev/null +++ b/src/serviceprovider/dbservice/store_registry.go @@ -0,0 +1,68 @@ +package dbservice + +import ( + "context" + "fmt" + + "github.com/Parallels/prl-devops-service/database/stores" + "gorm.io/gorm" +) + +// StoreRegistry manages all database stores +type StoreRegistry struct { + db *gorm.DB + + userStore stores.UserDataStoreInterface + roleStore stores.RoleDataStoreInterface + claimStore stores.ClaimDataStoreInterface +} + +// NewStoreRegistry creates and initializes all stores +func NewStoreRegistry(db *gorm.DB) (*StoreRegistry, error) { + ctx := context.Background() + + // Initialize user store + userStore := stores.GetUserDataStoreInstance() + if err := userStore.Init(ctx, db); err != nil { + return nil, fmt.Errorf("failed to initialize user store: %w", err) + } + + // Initialize role store + roleStore := stores.GetRoleDataStoreInstance() + if err := roleStore.Init(ctx, db); err != nil { + return nil, fmt.Errorf("failed to initialize role store: %w", err) + } + + // Initialize claim store + claimStore := stores.GetClaimDataStoreInstance() + if err := claimStore.Init(ctx, db); err != nil { + return nil, fmt.Errorf("failed to initialize claim store: %w", err) + } + + return &StoreRegistry{ + db: db, + userStore: userStore, + roleStore: roleStore, + claimStore: claimStore, + }, nil +} + +// User returns the user data store +func (r *StoreRegistry) User() stores.UserDataStoreInterface { + return r.userStore +} + +// Role returns the role data store +func (r *StoreRegistry) Role() stores.RoleDataStoreInterface { + return r.roleStore +} + +// Claim returns the claim data store +func (r *StoreRegistry) Claim() stores.ClaimDataStoreInterface { + return r.claimStore +} + +// DB returns the underlying database connection +func (r *StoreRegistry) DB() *gorm.DB { + return r.db +} From ae82ab3dc474f3faee15271a69268c094d1cc3e8 Mon Sep 17 00:00:00 2001 From: Sai Kumar P Date: Fri, 10 Jul 2026 15:58:20 +0200 Subject: [PATCH 3/5] refactor: Rename BaseContextLogger to GormContextLogger and update logger initialization in builder --- src/database/service/logger.go | 20 ++++++++++---------- src/serviceprovider/dbservice/builder.go | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/database/service/logger.go b/src/database/service/logger.go index 206fb31a..1e38c9ac 100644 --- a/src/database/service/logger.go +++ b/src/database/service/logger.go @@ -8,17 +8,17 @@ import ( "gorm.io/gorm/logger" ) -// BaseContextLogger is a GORM logger that bridges to basecontext.ApiContext -type BaseContextLogger struct { +// GormContextLogger is a GORM logger that bridges to basecontext.ApiContext +type GormContextLogger struct { ctx basecontext.ApiContext SlowThreshold time.Duration IgnoreRecordNotFound bool LogLevel logger.LogLevel } -// NewBaseContextLogger creates a new GORM logger that writes to basecontext -func NewBaseContextLogger(ctx basecontext.ApiContext, level logger.LogLevel) *BaseContextLogger { - return &BaseContextLogger{ +// NewGormContextLogger creates a new GORM logger that writes to basecontext +func NewGormContextLogger(ctx basecontext.ApiContext, level logger.LogLevel) *GormContextLogger { + return &GormContextLogger{ ctx: ctx, SlowThreshold: 200 * time.Millisecond, IgnoreRecordNotFound: true, @@ -27,35 +27,35 @@ func NewBaseContextLogger(ctx basecontext.ApiContext, level logger.LogLevel) *Ba } // LogMode sets the log level -func (l *BaseContextLogger) LogMode(level logger.LogLevel) logger.Interface { +func (l *GormContextLogger) LogMode(level logger.LogLevel) logger.Interface { newLogger := *l newLogger.LogLevel = level return &newLogger } // Info logs info messages -func (l *BaseContextLogger) Info(ctx context.Context, msg string, data ...interface{}) { +func (l *GormContextLogger) Info(ctx context.Context, msg string, data ...interface{}) { if l.LogLevel >= logger.Info { l.ctx.LogInfof(msg, data...) } } // Warn logs warning messages -func (l *BaseContextLogger) Warn(ctx context.Context, msg string, data ...interface{}) { +func (l *GormContextLogger) Warn(ctx context.Context, msg string, data ...interface{}) { if l.LogLevel >= logger.Warn { l.ctx.LogWarnf(msg, data...) } } // Error logs error messages -func (l *BaseContextLogger) Error(ctx context.Context, msg string, data ...interface{}) { +func (l *GormContextLogger) Error(ctx context.Context, msg string, data ...interface{}) { if l.LogLevel >= logger.Error { l.ctx.LogErrorf(msg, data...) } } // Trace logs SQL queries and execution time -func (l *BaseContextLogger) Trace(ctx context.Context, begin time.Time, fc func() (sql string, rowsAffected int64), err error) { +func (l *GormContextLogger) Trace(ctx context.Context, begin time.Time, fc func() (sql string, rowsAffected int64), err error) { if l.LogLevel <= logger.Silent { return } diff --git a/src/serviceprovider/dbservice/builder.go b/src/serviceprovider/dbservice/builder.go index f9f4057d..3f8ee492 100644 --- a/src/serviceprovider/dbservice/builder.go +++ b/src/serviceprovider/dbservice/builder.go @@ -79,7 +79,7 @@ func (b *Builder) Build() (*DatabaseService, *apperrors.Diagnostics) { // Step 4: Configure logger logLevel := service.ConvertLogLevel(b.cfg.IsDebugEnabled()) - customLogger := service.NewBaseContextLogger(b.ctx, logLevel) + customLogger := service.NewGormContextLogger(b.ctx, logLevel) db.Logger = customLogger // Step 5: Auto-migrate (optional) From 904577d81ae74cd5867b4d6199b14df0cda864e1 Mon Sep 17 00:00:00 2001 From: Sai Kumar P Date: Fri, 10 Jul 2026 17:15:24 +0200 Subject: [PATCH 4/5] feat(database): Implement connection management and service initialization - Added a new DatabaseService to manage database connections using GORM. - Introduced singleton pattern for DatabaseService to ensure a single instance. - Implemented SQLite and PostgreSQL initialization logic with connection pooling. - Created a StoreRegistry to manage data stores for user, role, and claim operations. - Added AuthDomain interface for authentication and authorization operations. - Developed AuthService to handle user retrieval with fallback logic. - Implemented GormContextLogger for logging SQL queries with context. - Created tests for SQLite and PostgreSQL initialization, connection pooling, and service methods. - Refactored existing database service references to use the new connection management structure. --- .../dbservice => database}/builder.go | 10 +++--- .../service.go => connection/factory.go} | 2 +- .../{service => connection}/postgres.go | 2 +- .../{service => connection}/service_test.go | 2 +- .../{service => connection}/sqlite.go | 2 +- .../{service => connection}/sqlite_test.go | 2 +- src/database/database.go | 16 ++++----- .../interfaces/auth_domain.go} | 0 src/database/{service => }/logger.go | 2 +- .../database.go => database/service.go} | 8 ++--- .../dbservice => database}/store_registry.go | 2 +- .../stores/auth_service.go} | 33 +++++++++---------- src/serviceprovider/data.go | 6 ++-- src/serviceprovider/main.go | 8 ++--- 14 files changed, 47 insertions(+), 48 deletions(-) rename src/{serviceprovider/dbservice => database}/builder.go (94%) rename src/database/{service/service.go => connection/factory.go} (99%) rename src/database/{service => connection}/postgres.go (99%) rename src/database/{service => connection}/service_test.go (99%) rename src/database/{service => connection}/sqlite.go (98%) rename src/database/{service => connection}/sqlite_test.go (99%) rename src/{serviceprovider/dbservice/interfaces/domains.go => database/interfaces/auth_domain.go} (100%) rename src/database/{service => }/logger.go (99%) rename src/{serviceprovider/dbservice/database.go => database/service.go} (93%) rename src/{serviceprovider/dbservice => database}/store_registry.go (98%) rename src/{serviceprovider/dbservice/domains/auth/service.go => database/stores/auth_service.go} (68%) diff --git a/src/serviceprovider/dbservice/builder.go b/src/database/builder.go similarity index 94% rename from src/serviceprovider/dbservice/builder.go rename to src/database/builder.go index 3f8ee492..5c21b545 100644 --- a/src/serviceprovider/dbservice/builder.go +++ b/src/database/builder.go @@ -1,4 +1,4 @@ -package dbservice +package database import ( "context" @@ -8,7 +8,7 @@ import ( "github.com/Parallels/prl-devops-service/config" "github.com/Parallels/prl-devops-service/data/models" "github.com/Parallels/prl-devops-service/database/common" - "github.com/Parallels/prl-devops-service/database/service" + "github.com/Parallels/prl-devops-service/database/connection" apperrors "github.com/Parallels/prl-devops-service/errors" "gorm.io/gorm" ) @@ -56,7 +56,7 @@ func (b *Builder) Build() (*DatabaseService, *apperrors.Diagnostics) { dbConfig := buildDatabaseConfig(b.cfg) // Step 2: Initialize centralized database service - dbSvc, err := service.Initialize(dbConfig) + dbSvc, err := connection.Initialize(dbConfig) if err != nil { diag.AddError("db_init_failed", fmt.Sprintf("failed to initialize database service: %v", err), "builder", nil) return nil, diag @@ -78,8 +78,8 @@ func (b *Builder) Build() (*DatabaseService, *apperrors.Diagnostics) { } // Step 4: Configure logger - logLevel := service.ConvertLogLevel(b.cfg.IsDebugEnabled()) - customLogger := service.NewGormContextLogger(b.ctx, logLevel) + logLevel := ConvertLogLevel(b.cfg.IsDebugEnabled()) + customLogger := NewGormContextLogger(b.ctx, logLevel) db.Logger = customLogger // Step 5: Auto-migrate (optional) diff --git a/src/database/service/service.go b/src/database/connection/factory.go similarity index 99% rename from src/database/service/service.go rename to src/database/connection/factory.go index c16c6151..bc9d1ddf 100644 --- a/src/database/service/service.go +++ b/src/database/connection/factory.go @@ -1,4 +1,4 @@ -package service +package connection import ( "context" diff --git a/src/database/service/postgres.go b/src/database/connection/postgres.go similarity index 99% rename from src/database/service/postgres.go rename to src/database/connection/postgres.go index 3a135a34..e73411bb 100644 --- a/src/database/service/postgres.go +++ b/src/database/connection/postgres.go @@ -1,4 +1,4 @@ -package service +package connection import ( "context" diff --git a/src/database/service/service_test.go b/src/database/connection/service_test.go similarity index 99% rename from src/database/service/service_test.go rename to src/database/connection/service_test.go index 64b14367..fe454f85 100644 --- a/src/database/service/service_test.go +++ b/src/database/connection/service_test.go @@ -1,4 +1,4 @@ -package service +package connection import ( "context" diff --git a/src/database/service/sqlite.go b/src/database/connection/sqlite.go similarity index 98% rename from src/database/service/sqlite.go rename to src/database/connection/sqlite.go index f48ae601..7525b7d5 100644 --- a/src/database/service/sqlite.go +++ b/src/database/connection/sqlite.go @@ -1,4 +1,4 @@ -package service +package connection import ( "database/sql" diff --git a/src/database/service/sqlite_test.go b/src/database/connection/sqlite_test.go similarity index 99% rename from src/database/service/sqlite_test.go rename to src/database/connection/sqlite_test.go index 21dcb2c0..167a271d 100644 --- a/src/database/service/sqlite_test.go +++ b/src/database/connection/sqlite_test.go @@ -1,4 +1,4 @@ -package service +package connection import ( "os" diff --git a/src/database/database.go b/src/database/database.go index 88ce1e84..4d5ca47c 100644 --- a/src/database/database.go +++ b/src/database/database.go @@ -3,20 +3,20 @@ package database import ( "github.com/Parallels/prl-devops-service/database/common" - "github.com/Parallels/prl-devops-service/database/service" + "github.com/Parallels/prl-devops-service/database/connection" ) -// Initialize bootstraps the Database service. -func Initialize(cfg common.Config) (*service.DatabaseService, error) { - return service.Initialize(cfg) +// Initialize bootstraps the Database connection service. +func Initialize(cfg common.Config) (*connection.DatabaseService, error) { + return connection.Initialize(cfg) } -// GetInstance returns the Database service singleton. -func GetInstance() *service.DatabaseService { - return service.GetInstance() +// GetInstance returns the Database connection service singleton. +func GetInstance() *connection.DatabaseService { + return connection.GetInstance() } // Reset clears the singleton (for tests). func Reset() { - service.Reset() + connection.Reset() } diff --git a/src/serviceprovider/dbservice/interfaces/domains.go b/src/database/interfaces/auth_domain.go similarity index 100% rename from src/serviceprovider/dbservice/interfaces/domains.go rename to src/database/interfaces/auth_domain.go diff --git a/src/database/service/logger.go b/src/database/logger.go similarity index 99% rename from src/database/service/logger.go rename to src/database/logger.go index 1e38c9ac..56dbb5be 100644 --- a/src/database/service/logger.go +++ b/src/database/logger.go @@ -1,4 +1,4 @@ -package service +package database import ( "context" diff --git a/src/serviceprovider/dbservice/database.go b/src/database/service.go similarity index 93% rename from src/serviceprovider/dbservice/database.go rename to src/database/service.go index 4df59cbe..b656cee1 100644 --- a/src/serviceprovider/dbservice/database.go +++ b/src/database/service.go @@ -1,13 +1,13 @@ -package dbservice +package database import ( "sync" "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/config" + "github.com/Parallels/prl-devops-service/database/interfaces" + "github.com/Parallels/prl-devops-service/database/stores" apperrors "github.com/Parallels/prl-devops-service/errors" - "github.com/Parallels/prl-devops-service/serviceprovider/dbservice/domains/auth" - "github.com/Parallels/prl-devops-service/serviceprovider/dbservice/interfaces" "gorm.io/gorm" ) @@ -34,7 +34,7 @@ func NewDatabaseService(cfg *config.Config, ctx basecontext.ApiContext) (*Databa // Auth returns the authentication domain service (lazy-loaded) func (s *DatabaseService) Auth() interfaces.AuthDomain { s.authOnce.Do(func() { - s.auth = auth.NewService( + s.auth = stores.NewAuthService( s.stores.User(), s.stores.Role(), s.stores.Claim(), diff --git a/src/serviceprovider/dbservice/store_registry.go b/src/database/store_registry.go similarity index 98% rename from src/serviceprovider/dbservice/store_registry.go rename to src/database/store_registry.go index 7fe4a58d..11cbc166 100644 --- a/src/serviceprovider/dbservice/store_registry.go +++ b/src/database/store_registry.go @@ -1,4 +1,4 @@ -package dbservice +package database import ( "context" diff --git a/src/serviceprovider/dbservice/domains/auth/service.go b/src/database/stores/auth_service.go similarity index 68% rename from src/serviceprovider/dbservice/domains/auth/service.go rename to src/database/stores/auth_service.go index 6d0bd582..1b5d4fe7 100644 --- a/src/serviceprovider/dbservice/domains/auth/service.go +++ b/src/database/stores/auth_service.go @@ -1,33 +1,32 @@ -package auth +package stores import ( "fmt" "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/data/models" - "github.com/Parallels/prl-devops-service/database/stores" + "github.com/Parallels/prl-devops-service/database/interfaces" apperrors "github.com/Parallels/prl-devops-service/errors" - "github.com/Parallels/prl-devops-service/serviceprovider/dbservice/interfaces" ) // Compile-time interface compliance check -var _ interfaces.AuthDomain = (*Service)(nil) +var _ interfaces.AuthDomain = (*AuthService)(nil) -// Service handles authentication and authorization domain operations with business logic +// AuthService handles authentication and authorization domain operations with business logic // For simple CRUD operations, use db.Stores() directly instead of adding pass-through methods here -type Service struct { - userStore stores.UserDataStoreInterface - roleStore stores.RoleDataStoreInterface - claimStore stores.ClaimDataStoreInterface +type AuthService struct { + userStore UserDataStoreInterface + roleStore RoleDataStoreInterface + claimStore ClaimDataStoreInterface } -// NewService creates a new auth domain service -func NewService( - userStore stores.UserDataStoreInterface, - roleStore stores.RoleDataStoreInterface, - claimStore stores.ClaimDataStoreInterface, -) *Service { - return &Service{ +// NewAuthService creates a new auth domain service +func NewAuthService( + userStore UserDataStoreInterface, + roleStore RoleDataStoreInterface, + claimStore ClaimDataStoreInterface, +) *AuthService { + return &AuthService{ userStore: userStore, roleStore: roleStore, claimStore: claimStore, @@ -45,7 +44,7 @@ func toBaseContext(ctx basecontext.ApiContext) *basecontext.BaseContext { // GetUser retrieves a user by ID or username with smart fallback logic // This method adds value by trying multiple lookup strategies -func (s *Service) GetUser(ctx basecontext.ApiContext, idOrEmail string) (*models.User, *apperrors.Diagnostics) { +func (s *AuthService) GetUser(ctx basecontext.ApiContext, idOrEmail string) (*models.User, *apperrors.Diagnostics) { baseCtx := toBaseContext(ctx) // Try by ID first diff --git a/src/serviceprovider/data.go b/src/serviceprovider/data.go index 44ab89c9..5f2bc11c 100644 --- a/src/serviceprovider/data.go +++ b/src/serviceprovider/data.go @@ -3,14 +3,14 @@ package serviceprovider import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/data" + "github.com/Parallels/prl-devops-service/database" apperrors "github.com/Parallels/prl-devops-service/errors" - "github.com/Parallels/prl-devops-service/serviceprovider/dbservice" ) // GetDatabaseService returns the GORM-based database service // This is the new implementation using database stores -func GetDatabaseService(ctx basecontext.ApiContext) (*dbservice.DatabaseService, *apperrors.Diagnostics) { - db := dbservice.GetDatabaseService() +func GetDatabaseService(ctx basecontext.ApiContext) (*database.DatabaseService, *apperrors.Diagnostics) { + db := database.GetDatabaseService() if db == nil { diag := apperrors.NewDiagnostics("get_database_service") diag.AddError("not_connected", "database not connected - call InitDatabase first", "serviceprovider", nil) diff --git a/src/serviceprovider/main.go b/src/serviceprovider/main.go index 0f6db20b..4e0e25d2 100644 --- a/src/serviceprovider/main.go +++ b/src/serviceprovider/main.go @@ -11,11 +11,11 @@ import ( "github.com/Parallels/prl-devops-service/config" "github.com/Parallels/prl-devops-service/constants" "github.com/Parallels/prl-devops-service/data" + "github.com/Parallels/prl-devops-service/database" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/models" "github.com/Parallels/prl-devops-service/serviceprovider/brew" - "github.com/Parallels/prl-devops-service/serviceprovider/dbservice" "github.com/Parallels/prl-devops-service/serviceprovider/git" "github.com/Parallels/prl-devops-service/serviceprovider/interfaces" "github.com/Parallels/prl-devops-service/serviceprovider/packer" @@ -83,7 +83,7 @@ func InitCatalogServices(ctx basecontext.ApiContext) { _ = globalProvider.JsonDatabase.Connect(ctx) // Initialize GORM database service - _, err = dbservice.InitDatabase(ctx) + _, err = database.InitDatabase(ctx) if err != nil { ctx.LogErrorf("Failed to initialize GORM database: %v", err) } @@ -227,7 +227,7 @@ func InitServices(ctx basecontext.ApiContext) { globalProvider.ParallelsDesktopService.InitSnapshotTreeInDB(ctx) // Initialize GORM database service - _, err = dbservice.InitDatabase(ctx) + _, err = database.InitDatabase(ctx) if err != nil { ctx.LogErrorf("Failed to initialize GORM database: %v", err) } @@ -256,7 +256,7 @@ func InitServices(ctx basecontext.ApiContext) { globalProvider.ParallelsDesktopService.InitSnapshotTreeInDB(ctx) // Initialize GORM database service - _, err = dbservice.InitDatabase(ctx) + _, err = database.InitDatabase(ctx) if err != nil { ctx.LogErrorf("Failed to initialize GORM database: %v", err) } From b3f9e5c3ad00aa186d6fc3adc78847e73c8612b0 Mon Sep 17 00:00:00 2001 From: Sai Kumar P Date: Tue, 14 Jul 2026 15:01:22 +0200 Subject: [PATCH 5/5] Refactor import paths from data/models to database/models across multiple orchestrator and service provider files - Updated import statements in orchestrator files to reflect the new database package structure. - Adjusted import paths in service provider files to use the updated database models. - Modified test files to ensure they reference the correct models from the database package. - Ensured consistency in import paths across the codebase for better maintainability and clarity. --- src/catalog/delete.go | 2 +- src/catalog/import.go | 2 +- src/catalog/import_vm.go | 2 +- src/catalog/providers/artifactory/main_test.go | 2 +- src/cmd/migrate-data/main.go | 2 +- src/cmd/migrate-to-db/main.go | 2 +- src/controllers/authorization.go | 2 +- src/controllers/catalog.go | 2 +- src/controllers/catalog_managers.go | 2 +- src/controllers/reverse_proxy.go | 2 +- src/controllers/user_configs.go | 2 +- src/data/api_key.go | 2 +- src/data/api_key_test.go | 2 +- src/data/catalog.go | 2 +- src/data/catalog_managers.go | 2 +- src/data/catalog_managers_test.go | 2 +- src/data/catalog_test.go | 2 +- src/data/claims.go | 2 +- src/data/claims_test.go | 2 +- src/data/concurrency_test.go | 2 +- src/data/config.go | 2 +- src/data/jobs.go | 2 +- src/data/main.go | 2 +- src/data/main_test.go | 2 +- src/data/orchestrator.go | 2 +- src/data/orchestrator_enrollment_token.go | 2 +- src/data/orchestrator_test.go | 2 +- src/data/packer_template.go | 2 +- src/data/packer_template_test.go | 2 +- src/data/reverse_proxy.go | 2 +- src/data/reverse_proxy_test.go | 2 +- src/data/roles.go | 2 +- src/data/roles_claims_test.go | 2 +- src/data/roles_test.go | 2 +- src/data/user_config.go | 2 +- src/data/users.go | 2 +- src/data/users_test.go | 2 +- src/data/vm_snapshots.go | 2 +- src/data/vm_snapshots_test.go | 2 +- src/database/builder.go | 2 +- src/database/interfaces/auth_domain.go | 2 +- src/database/migrations/integration_test.go | 2 +- src/database/migrations/workers/default_admin_user.go | 2 +- src/database/migrations/workers/default_claims.go | 2 +- src/database/migrations/workers/default_roles.go | 2 +- src/{data => database}/models/VM_Snapshots.go | 0 src/{data => database}/models/_config_old.go | 0 src/{data => database}/models/activity.go | 0 src/{data => database}/models/activity_types.go | 0 src/{data => database}/models/api_key.go | 0 src/{data => database}/models/base.go | 0 src/{data => database}/models/catalog_manager.go | 0 src/{data => database}/models/catalog_manifest.go | 0 src/{data => database}/models/claim.go | 0 src/{data => database}/models/configuration.go | 0 src/{data => database}/models/db_common.go | 0 src/{data => database}/models/email_template.go | 0 src/{data => database}/models/host_resources.go | 0 src/{data => database}/models/ip_ban.go | 0 src/{data => database}/models/job.go | 0 src/{data => database}/models/message.go | 0 src/{data => database}/models/notification.go | 0 src/{data => database}/models/notification_channel.go | 0 src/{data => database}/models/notification_channel_config.go | 0 .../models/orchestrator_enrollment_token.go | 0 src/{data => database}/models/orchestrator_host.go | 0 .../models/orchestrator_host_authentication.go | 0 src/{data => database}/models/orchestrator_vm_snapshots.go | 0 src/{data => database}/models/packer_template.go | 0 src/{data => database}/models/repository.go | 0 src/{data => database}/models/reverse_proxy.go | 0 src/{data => database}/models/role.go | 0 src/{data => database}/models/role_claims.go | 0 src/{data => database}/models/schema.go | 0 src/{data => database}/models/tenant.go | 0 src/{data => database}/models/user.go | 0 src/{data => database}/models/user_config.go | 0 src/{data => database}/models/virtual_machine.go | 0 src/{data => database}/models/virtual_machines.go | 0 src/{data => database}/models/webauthn_credential.go | 0 src/database/stores/_tenant_store_not_needed.go | 2 +- src/database/stores/activity_store.go | 2 +- src/database/stores/activity_store_test.go | 2 +- src/database/stores/api_key_store.go | 2 +- src/database/stores/api_key_store_test.go | 2 +- src/database/stores/auth_service.go | 2 +- src/database/stores/claim_store.go | 2 +- src/database/stores/claim_store_test.go | 2 +- src/database/stores/configuration_store.go | 2 +- src/database/stores/configuration_store_test.go | 2 +- src/database/stores/email_store.go | 2 +- src/database/stores/email_store_test.go | 2 +- src/database/stores/ip_ban_store.go | 2 +- src/database/stores/ip_ban_store_test.go | 2 +- src/database/stores/message_store.go | 2 +- src/database/stores/message_store_test.go | 2 +- src/database/stores/notification_store.go | 2 +- src/database/stores/notification_store_test.go | 2 +- src/database/stores/role_store.go | 2 +- src/database/stores/testhelpers/db.go | 2 +- src/database/stores/user_store.go | 2 +- src/database/stores/user_store_test.go | 2 +- src/database/stores/webauthn_store.go | 2 +- src/database/stores/webauthn_store_test.go | 2 +- src/jobs/main.go | 2 +- src/jobs/tracker/service.go | 2 +- src/mappers/api_key.go | 2 +- src/mappers/api_key_test.go | 2 +- src/mappers/catalog.go | 2 +- src/mappers/catalog_managers.go | 2 +- src/mappers/claim.go | 2 +- src/mappers/effective_claims.go | 2 +- src/mappers/effective_claims_test.go | 2 +- src/mappers/job.go | 2 +- src/mappers/orchestrator.go | 2 +- src/mappers/packer_template.go | 2 +- src/mappers/reverse_proxy.go | 2 +- src/mappers/reverse_proxy_host.go | 2 +- src/mappers/reverse_proxy_host_cors.go | 2 +- src/mappers/reverse_proxy_host_http_route.go | 2 +- src/mappers/reverse_proxy_host_tcp_route.go | 2 +- src/mappers/reverse_proxy_host_tls.go | 2 +- src/mappers/role.go | 2 +- src/mappers/system.go | 2 +- src/mappers/t.go | 2 +- src/mappers/user.go | 2 +- src/mappers/user_config.go | 2 +- src/mappers/virtual_machine.go | 2 +- src/mappers/virtual_machine_advanced.go | 2 +- src/mappers/virtual_machine_cdrom.go | 2 +- src/mappers/virtual_machine_coherence.go | 2 +- src/mappers/virtual_machine_cpu.go | 2 +- src/mappers/virtual_machine_expiration.go | 2 +- src/mappers/virtual_machine_fullscreen.go | 2 +- src/mappers/virtual_machine_guest_shared_folders.go | 2 +- src/mappers/virtual_machine_guest_tools.go | 2 +- src/mappers/virtual_machine_hardware.go | 2 +- src/mappers/virtual_machine_hdd.go | 2 +- src/mappers/virtual_machine_memory.go | 2 +- src/mappers/virtual_machine_memory_quota.go | 2 +- src/mappers/virtual_machine_miscellaneous_sharing.go | 2 +- src/mappers/virtual_machine_modality.go | 2 +- src/mappers/virtual_machine_mouse_and_keyboard.go | 2 +- src/mappers/virtual_machine_net.go | 2 +- src/mappers/virtual_machine_network_information.go | 2 +- src/mappers/virtual_machine_optimization.go | 2 +- src/mappers/virtual_machine_print_management.go | 2 +- src/mappers/virtual_machine_security.go | 2 +- src/mappers/virtual_machine_shared_applications.go | 2 +- src/mappers/virtual_machine_smart_mount.go | 2 +- src/mappers/virtual_machine_smbios_settings.go | 2 +- src/mappers/virtual_machine_sound.go | 2 +- src/mappers/virtual_machine_startup_and_shutdown.go | 2 +- src/mappers/virtual_machine_time_synchronization.go | 2 +- src/mappers/virtual_machine_travel_mode.go | 2 +- src/mappers/virtual_machine_usb_and_bluetooth.go | 2 +- src/mappers/virtual_machine_video.go | 2 +- src/mappers/vm_snapshots.go | 2 +- src/orchestrator/clone_host_virtual_machine.go | 2 +- src/orchestrator/common.go | 2 +- src/orchestrator/configure_host_virtual_machine.go | 2 +- src/orchestrator/create_host_reverse_proxy_host.go | 2 +- src/orchestrator/create_host_virtual_machine.go | 2 +- src/orchestrator/create_host_virtual_machine_test.go | 2 +- src/orchestrator/delete_host_catalog_cache.go | 2 +- src/orchestrator/delete_host_reverse_proxy_host.go | 2 +- src/orchestrator/delete_host_reverse_proxy_host_http_route.go | 2 +- src/orchestrator/delete_host_virtual_machine.go | 2 +- src/orchestrator/disable_host_reverse_proxy.go | 2 +- src/orchestrator/enable_disable_host.go | 2 +- src/orchestrator/enable_host_reverse_proxy.go | 2 +- src/orchestrator/execute_on_host_virtual_machine.go | 2 +- src/orchestrator/get_host_catalog_cache.go | 2 +- src/orchestrator/get_host_disk_space_info.go | 2 +- src/orchestrator/get_host_hardware_info.go | 2 +- src/orchestrator/get_host_logs.go | 2 +- src/orchestrator/get_host_reverse_proxy_config.go | 4 ++-- src/orchestrator/get_host_reverse_proxy_hosts.go | 4 ++-- src/orchestrator/get_host_virtual_machine_status.go | 2 +- src/orchestrator/get_host_virtual_machines.go | 2 +- src/orchestrator/get_hosts.go | 2 +- src/orchestrator/get_hosts_health_check.go | 2 +- src/orchestrator/get_hosts_health_check_test.go | 2 +- src/orchestrator/get_orchestrator_resources.go | 2 +- src/orchestrator/get_virtual_machines.go | 2 +- src/orchestrator/handlers/host_job_event_handler.go | 2 +- src/orchestrator/handlers/pdfm_event_handler.go | 2 +- src/orchestrator/host_virtual_machine_snapshots.go | 2 +- src/orchestrator/host_websocket_manager.go | 2 +- src/orchestrator/host_websocket_manager_test.go | 2 +- src/orchestrator/main.go | 2 +- src/orchestrator/pause_host_virtual_machine.go | 2 +- src/orchestrator/register_host.go | 2 +- src/orchestrator/register_host_virtual_machine.go | 2 +- src/orchestrator/rename_host_virtual_machine.go | 2 +- src/orchestrator/reset_host_virtual_machine.go | 2 +- src/orchestrator/restart_host_reverse_proxy.go | 2 +- src/orchestrator/restart_host_virtual_machine.go | 2 +- src/orchestrator/resume_host_virtual_machine.go | 2 +- src/orchestrator/start_host_virtual_machine.go | 2 +- src/orchestrator/stop_host_virtual_machine.go | 2 +- src/orchestrator/suspend_host_virtual_machine.go | 2 +- src/orchestrator/unregister_host_virtual_machine.go | 2 +- src/orchestrator/update_host.go | 2 +- src/orchestrator/update_host_reverse_proxy_host.go | 2 +- src/orchestrator/update_host_reverse_proxy_host_tcp_route.go | 2 +- src/orchestrator/upsert_host_reverse_proxy_host_http_route.go | 2 +- src/orchestrator/websocket_client.go | 2 +- src/restapi/apikey_authorization_middleware_test.go | 2 +- src/restapi/token_authorization_middleware.go | 2 +- src/restapi/token_authorization_middleware_test.go | 2 +- src/reverse_proxy/main.go | 2 +- src/security/apikey/apikey.go | 2 +- src/serviceprovider/parallelsdesktop/event_monitor.go | 2 +- src/serviceprovider/parallelsdesktop/main.go | 2 +- src/startup/main.go | 4 ++-- src/startup/seeds/claims.go | 2 +- src/startup/seeds/packertemplates/kali_linux_2023_3.go | 2 +- src/startup/seeds/packertemplates/macos_14_0.go | 2 +- src/startup/seeds/packertemplates/ubuntu_23_04.go | 2 +- src/startup/seeds/roles.go | 2 +- src/startup/seeds/users.go | 2 +- src/tests/controllers/orchestrator_sync_test.go | 2 +- 223 files changed, 191 insertions(+), 191 deletions(-) rename src/{data => database}/models/VM_Snapshots.go (100%) rename src/{data => database}/models/_config_old.go (100%) rename src/{data => database}/models/activity.go (100%) rename src/{data => database}/models/activity_types.go (100%) rename src/{data => database}/models/api_key.go (100%) rename src/{data => database}/models/base.go (100%) rename src/{data => database}/models/catalog_manager.go (100%) rename src/{data => database}/models/catalog_manifest.go (100%) rename src/{data => database}/models/claim.go (100%) rename src/{data => database}/models/configuration.go (100%) rename src/{data => database}/models/db_common.go (100%) rename src/{data => database}/models/email_template.go (100%) rename src/{data => database}/models/host_resources.go (100%) rename src/{data => database}/models/ip_ban.go (100%) rename src/{data => database}/models/job.go (100%) rename src/{data => database}/models/message.go (100%) rename src/{data => database}/models/notification.go (100%) rename src/{data => database}/models/notification_channel.go (100%) rename src/{data => database}/models/notification_channel_config.go (100%) rename src/{data => database}/models/orchestrator_enrollment_token.go (100%) rename src/{data => database}/models/orchestrator_host.go (100%) rename src/{data => database}/models/orchestrator_host_authentication.go (100%) rename src/{data => database}/models/orchestrator_vm_snapshots.go (100%) rename src/{data => database}/models/packer_template.go (100%) rename src/{data => database}/models/repository.go (100%) rename src/{data => database}/models/reverse_proxy.go (100%) rename src/{data => database}/models/role.go (100%) rename src/{data => database}/models/role_claims.go (100%) rename src/{data => database}/models/schema.go (100%) rename src/{data => database}/models/tenant.go (100%) rename src/{data => database}/models/user.go (100%) rename src/{data => database}/models/user_config.go (100%) rename src/{data => database}/models/virtual_machine.go (100%) rename src/{data => database}/models/virtual_machines.go (100%) rename src/{data => database}/models/webauthn_credential.go (100%) diff --git a/src/catalog/delete.go b/src/catalog/delete.go index 89168423..72dab9b0 100644 --- a/src/catalog/delete.go +++ b/src/catalog/delete.go @@ -6,7 +6,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/catalog/cleanupservice" "github.com/Parallels/prl-devops-service/catalog/models" - db_models "github.com/Parallels/prl-devops-service/data/models" + db_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/mappers" "github.com/Parallels/prl-devops-service/serviceprovider" diff --git a/src/catalog/import.go b/src/catalog/import.go index 12ab392c..7239dd8d 100644 --- a/src/catalog/import.go +++ b/src/catalog/import.go @@ -7,7 +7,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/catalog/models" "github.com/Parallels/prl-devops-service/data" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/mappers" diff --git a/src/catalog/import_vm.go b/src/catalog/import_vm.go index 52a8e712..83697410 100644 --- a/src/catalog/import_vm.go +++ b/src/catalog/import_vm.go @@ -11,7 +11,7 @@ import ( "github.com/Parallels/prl-devops-service/catalog/interfaces" "github.com/Parallels/prl-devops-service/catalog/models" "github.com/Parallels/prl-devops-service/data" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/mappers" diff --git a/src/catalog/providers/artifactory/main_test.go b/src/catalog/providers/artifactory/main_test.go index 1e6f1d61..6586d91f 100644 --- a/src/catalog/providers/artifactory/main_test.go +++ b/src/catalog/providers/artifactory/main_test.go @@ -12,7 +12,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/constants" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/jobs/tracker" "github.com/stretchr/testify/require" ) diff --git a/src/cmd/migrate-data/main.go b/src/cmd/migrate-data/main.go index 2926d4da..5301d949 100644 --- a/src/cmd/migrate-data/main.go +++ b/src/cmd/migrate-data/main.go @@ -8,7 +8,7 @@ import ( "os" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/database/stores" "gorm.io/driver/sqlite" "gorm.io/gorm" diff --git a/src/cmd/migrate-to-db/main.go b/src/cmd/migrate-to-db/main.go index 6027f0c1..38df33c4 100644 --- a/src/cmd/migrate-to-db/main.go +++ b/src/cmd/migrate-to-db/main.go @@ -9,7 +9,7 @@ import ( "path/filepath" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/database/stores" "gorm.io/driver/sqlite" "gorm.io/gorm" diff --git a/src/controllers/authorization.go b/src/controllers/authorization.go index 75c809c0..f786b4f9 100644 --- a/src/controllers/authorization.go +++ b/src/controllers/authorization.go @@ -7,7 +7,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/constants" - dbmodels "github.com/Parallels/prl-devops-service/data/models" + dbmodels "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/mappers" models "github.com/Parallels/prl-devops-service/models" diff --git a/src/controllers/catalog.go b/src/controllers/catalog.go index 72628eb1..75516d57 100644 --- a/src/controllers/catalog.go +++ b/src/controllers/catalog.go @@ -14,7 +14,7 @@ import ( catalog_models "github.com/Parallels/prl-devops-service/catalog/models" "github.com/Parallels/prl-devops-service/config" "github.com/Parallels/prl-devops-service/constants" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/jobs" "github.com/Parallels/prl-devops-service/mappers" diff --git a/src/controllers/catalog_managers.go b/src/controllers/catalog_managers.go index a618639d..e525d73c 100644 --- a/src/controllers/catalog_managers.go +++ b/src/controllers/catalog_managers.go @@ -21,7 +21,7 @@ import ( catalog_models "github.com/Parallels/prl-devops-service/catalog/models" "github.com/Parallels/prl-devops-service/config" "github.com/Parallels/prl-devops-service/constants" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/jobs" "github.com/Parallels/prl-devops-service/mappers" diff --git a/src/controllers/reverse_proxy.go b/src/controllers/reverse_proxy.go index aa3cef06..0f0a694d 100644 --- a/src/controllers/reverse_proxy.go +++ b/src/controllers/reverse_proxy.go @@ -8,7 +8,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/config" "github.com/Parallels/prl-devops-service/constants" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/mappers" diff --git a/src/controllers/user_configs.go b/src/controllers/user_configs.go index dfd61b1a..d09d973b 100644 --- a/src/controllers/user_configs.go +++ b/src/controllers/user_configs.go @@ -7,7 +7,7 @@ import ( "strconv" "github.com/Parallels/prl-devops-service/basecontext" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/mappers" "github.com/Parallels/prl-devops-service/models" diff --git a/src/data/api_key.go b/src/data/api_key.go index de2f9b3c..72e0acde 100644 --- a/src/data/api_key.go +++ b/src/data/api_key.go @@ -5,7 +5,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/constants" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/security/password" diff --git a/src/data/api_key_test.go b/src/data/api_key_test.go index ba4d87ae..a0e73b09 100644 --- a/src/data/api_key_test.go +++ b/src/data/api_key_test.go @@ -6,7 +6,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/constants" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/helpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/src/data/catalog.go b/src/data/catalog.go index a740521b..4a52f6ab 100644 --- a/src/data/catalog.go +++ b/src/data/catalog.go @@ -5,7 +5,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/constants" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" ) diff --git a/src/data/catalog_managers.go b/src/data/catalog_managers.go index 4f131b1b..31944a5d 100644 --- a/src/data/catalog_managers.go +++ b/src/data/catalog_managers.go @@ -4,7 +4,7 @@ import ( "errors" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" ) var ( diff --git a/src/data/catalog_managers_test.go b/src/data/catalog_managers_test.go index 98d55a29..174bf969 100644 --- a/src/data/catalog_managers_test.go +++ b/src/data/catalog_managers_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/src/data/catalog_test.go b/src/data/catalog_test.go index b22609ee..98ca01e3 100644 --- a/src/data/catalog_test.go +++ b/src/data/catalog_test.go @@ -5,7 +5,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/src/data/claims.go b/src/data/claims.go index 2bb58e69..29dd4c38 100644 --- a/src/data/claims.go +++ b/src/data/claims.go @@ -4,7 +4,7 @@ import ( "strings" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" ) diff --git a/src/data/claims_test.go b/src/data/claims_test.go index 7d65963d..481fcebf 100644 --- a/src/data/claims_test.go +++ b/src/data/claims_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/src/data/concurrency_test.go b/src/data/concurrency_test.go index 4c6ee530..95244ea7 100644 --- a/src/data/concurrency_test.go +++ b/src/data/concurrency_test.go @@ -12,7 +12,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/config" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/src/data/config.go b/src/data/config.go index b38a900d..a7cccfee 100644 --- a/src/data/config.go +++ b/src/data/config.go @@ -4,7 +4,7 @@ import ( "errors" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/security" "github.com/google/uuid" ) diff --git a/src/data/jobs.go b/src/data/jobs.go index cf6e132b..78b20dec 100644 --- a/src/data/jobs.go +++ b/src/data/jobs.go @@ -7,7 +7,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/config" "github.com/Parallels/prl-devops-service/constants" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" ) diff --git a/src/data/main.go b/src/data/main.go index 9d77efd4..f85a4c33 100644 --- a/src/data/main.go +++ b/src/data/main.go @@ -11,7 +11,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/config" "github.com/Parallels/prl-devops-service/constants" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/security" diff --git a/src/data/main_test.go b/src/data/main_test.go index 7cbd1258..e29fc94f 100644 --- a/src/data/main_test.go +++ b/src/data/main_test.go @@ -8,7 +8,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/config" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/src/data/orchestrator.go b/src/data/orchestrator.go index 71fa2bee..f8739764 100644 --- a/src/data/orchestrator.go +++ b/src/data/orchestrator.go @@ -4,7 +4,7 @@ import ( "strings" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" apimodels "github.com/Parallels/prl-devops-service/models" diff --git a/src/data/orchestrator_enrollment_token.go b/src/data/orchestrator_enrollment_token.go index b90827ae..1b035cd6 100644 --- a/src/data/orchestrator_enrollment_token.go +++ b/src/data/orchestrator_enrollment_token.go @@ -5,7 +5,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/google/uuid" diff --git a/src/data/orchestrator_test.go b/src/data/orchestrator_test.go index 26c996f7..32df6080 100644 --- a/src/data/orchestrator_test.go +++ b/src/data/orchestrator_test.go @@ -9,7 +9,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/config" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/src/data/packer_template.go b/src/data/packer_template.go index f8ce15bc..cecbc1bf 100644 --- a/src/data/packer_template.go +++ b/src/data/packer_template.go @@ -5,7 +5,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" ) diff --git a/src/data/packer_template_test.go b/src/data/packer_template_test.go index f6e0facb..8bd5036a 100644 --- a/src/data/packer_template_test.go +++ b/src/data/packer_template_test.go @@ -5,7 +5,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/src/data/reverse_proxy.go b/src/data/reverse_proxy.go index 63d95933..8b7c9f01 100644 --- a/src/data/reverse_proxy.go +++ b/src/data/reverse_proxy.go @@ -4,7 +4,7 @@ import ( "strings" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" ) diff --git a/src/data/reverse_proxy_test.go b/src/data/reverse_proxy_test.go index 152d9bed..bcf8c73a 100644 --- a/src/data/reverse_proxy_test.go +++ b/src/data/reverse_proxy_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/src/data/roles.go b/src/data/roles.go index 0da4a48d..e067fb45 100644 --- a/src/data/roles.go +++ b/src/data/roles.go @@ -4,7 +4,7 @@ import ( "strings" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" ) diff --git a/src/data/roles_claims_test.go b/src/data/roles_claims_test.go index 652495dc..9b42e793 100644 --- a/src/data/roles_claims_test.go +++ b/src/data/roles_claims_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/src/data/roles_test.go b/src/data/roles_test.go index 62b4cf9b..46104c67 100644 --- a/src/data/roles_test.go +++ b/src/data/roles_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/src/data/user_config.go b/src/data/user_config.go index 84b4f47d..aaf1131c 100644 --- a/src/data/user_config.go +++ b/src/data/user_config.go @@ -4,7 +4,7 @@ import ( "strings" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" ) diff --git a/src/data/users.go b/src/data/users.go index 84b952e5..5c6954b5 100644 --- a/src/data/users.go +++ b/src/data/users.go @@ -5,7 +5,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/constants" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/security/password" diff --git a/src/data/users_test.go b/src/data/users_test.go index 7994d242..51f955f5 100644 --- a/src/data/users_test.go +++ b/src/data/users_test.go @@ -6,7 +6,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/constants" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/src/data/vm_snapshots.go b/src/data/vm_snapshots.go index 06de6ed8..0084d9c7 100644 --- a/src/data/vm_snapshots.go +++ b/src/data/vm_snapshots.go @@ -3,7 +3,7 @@ package data import ( "errors" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" ) func (j *JsonDatabase) SetListVMSnapshotsByVMId(vmID string, newVmSnap models.VMSnapshots) error { diff --git a/src/data/vm_snapshots_test.go b/src/data/vm_snapshots_test.go index 86898720..49d6b6bf 100644 --- a/src/data/vm_snapshots_test.go +++ b/src/data/vm_snapshots_test.go @@ -3,7 +3,7 @@ package data import ( "testing" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/mappers" apiModels "github.com/Parallels/prl-devops-service/models" "github.com/stretchr/testify/assert" diff --git a/src/database/builder.go b/src/database/builder.go index 5c21b545..efc888cb 100644 --- a/src/database/builder.go +++ b/src/database/builder.go @@ -6,7 +6,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/config" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/database/common" "github.com/Parallels/prl-devops-service/database/connection" apperrors "github.com/Parallels/prl-devops-service/errors" diff --git a/src/database/interfaces/auth_domain.go b/src/database/interfaces/auth_domain.go index 0519a6c9..64215c92 100644 --- a/src/database/interfaces/auth_domain.go +++ b/src/database/interfaces/auth_domain.go @@ -2,7 +2,7 @@ package interfaces import ( "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" apperrors "github.com/Parallels/prl-devops-service/errors" ) diff --git a/src/database/migrations/integration_test.go b/src/database/migrations/integration_test.go index 98a14934..b4405d32 100644 --- a/src/database/migrations/integration_test.go +++ b/src/database/migrations/integration_test.go @@ -6,7 +6,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/constants" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/database/common" "github.com/Parallels/prl-devops-service/database/migrations/workers" "github.com/Parallels/prl-devops-service/database/stores" diff --git a/src/database/migrations/workers/default_admin_user.go b/src/database/migrations/workers/default_admin_user.go index e1623898..4dab038a 100644 --- a/src/database/migrations/workers/default_admin_user.go +++ b/src/database/migrations/workers/default_admin_user.go @@ -4,7 +4,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/config" "github.com/Parallels/prl-devops-service/constants" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/database/common" "github.com/Parallels/prl-devops-service/database/stores" apperrors "github.com/Parallels/prl-devops-service/errors" diff --git a/src/database/migrations/workers/default_claims.go b/src/database/migrations/workers/default_claims.go index 4a234d46..91e2e68a 100644 --- a/src/database/migrations/workers/default_claims.go +++ b/src/database/migrations/workers/default_claims.go @@ -3,7 +3,7 @@ package workers import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/constants" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/database/common" "github.com/Parallels/prl-devops-service/database/stores" apperrors "github.com/Parallels/prl-devops-service/errors" diff --git a/src/database/migrations/workers/default_roles.go b/src/database/migrations/workers/default_roles.go index d2780c5d..89b2d6a4 100644 --- a/src/database/migrations/workers/default_roles.go +++ b/src/database/migrations/workers/default_roles.go @@ -3,7 +3,7 @@ package workers import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/constants" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/database/common" "github.com/Parallels/prl-devops-service/database/stores" apperrors "github.com/Parallels/prl-devops-service/errors" diff --git a/src/data/models/VM_Snapshots.go b/src/database/models/VM_Snapshots.go similarity index 100% rename from src/data/models/VM_Snapshots.go rename to src/database/models/VM_Snapshots.go diff --git a/src/data/models/_config_old.go b/src/database/models/_config_old.go similarity index 100% rename from src/data/models/_config_old.go rename to src/database/models/_config_old.go diff --git a/src/data/models/activity.go b/src/database/models/activity.go similarity index 100% rename from src/data/models/activity.go rename to src/database/models/activity.go diff --git a/src/data/models/activity_types.go b/src/database/models/activity_types.go similarity index 100% rename from src/data/models/activity_types.go rename to src/database/models/activity_types.go diff --git a/src/data/models/api_key.go b/src/database/models/api_key.go similarity index 100% rename from src/data/models/api_key.go rename to src/database/models/api_key.go diff --git a/src/data/models/base.go b/src/database/models/base.go similarity index 100% rename from src/data/models/base.go rename to src/database/models/base.go diff --git a/src/data/models/catalog_manager.go b/src/database/models/catalog_manager.go similarity index 100% rename from src/data/models/catalog_manager.go rename to src/database/models/catalog_manager.go diff --git a/src/data/models/catalog_manifest.go b/src/database/models/catalog_manifest.go similarity index 100% rename from src/data/models/catalog_manifest.go rename to src/database/models/catalog_manifest.go diff --git a/src/data/models/claim.go b/src/database/models/claim.go similarity index 100% rename from src/data/models/claim.go rename to src/database/models/claim.go diff --git a/src/data/models/configuration.go b/src/database/models/configuration.go similarity index 100% rename from src/data/models/configuration.go rename to src/database/models/configuration.go diff --git a/src/data/models/db_common.go b/src/database/models/db_common.go similarity index 100% rename from src/data/models/db_common.go rename to src/database/models/db_common.go diff --git a/src/data/models/email_template.go b/src/database/models/email_template.go similarity index 100% rename from src/data/models/email_template.go rename to src/database/models/email_template.go diff --git a/src/data/models/host_resources.go b/src/database/models/host_resources.go similarity index 100% rename from src/data/models/host_resources.go rename to src/database/models/host_resources.go diff --git a/src/data/models/ip_ban.go b/src/database/models/ip_ban.go similarity index 100% rename from src/data/models/ip_ban.go rename to src/database/models/ip_ban.go diff --git a/src/data/models/job.go b/src/database/models/job.go similarity index 100% rename from src/data/models/job.go rename to src/database/models/job.go diff --git a/src/data/models/message.go b/src/database/models/message.go similarity index 100% rename from src/data/models/message.go rename to src/database/models/message.go diff --git a/src/data/models/notification.go b/src/database/models/notification.go similarity index 100% rename from src/data/models/notification.go rename to src/database/models/notification.go diff --git a/src/data/models/notification_channel.go b/src/database/models/notification_channel.go similarity index 100% rename from src/data/models/notification_channel.go rename to src/database/models/notification_channel.go diff --git a/src/data/models/notification_channel_config.go b/src/database/models/notification_channel_config.go similarity index 100% rename from src/data/models/notification_channel_config.go rename to src/database/models/notification_channel_config.go diff --git a/src/data/models/orchestrator_enrollment_token.go b/src/database/models/orchestrator_enrollment_token.go similarity index 100% rename from src/data/models/orchestrator_enrollment_token.go rename to src/database/models/orchestrator_enrollment_token.go diff --git a/src/data/models/orchestrator_host.go b/src/database/models/orchestrator_host.go similarity index 100% rename from src/data/models/orchestrator_host.go rename to src/database/models/orchestrator_host.go diff --git a/src/data/models/orchestrator_host_authentication.go b/src/database/models/orchestrator_host_authentication.go similarity index 100% rename from src/data/models/orchestrator_host_authentication.go rename to src/database/models/orchestrator_host_authentication.go diff --git a/src/data/models/orchestrator_vm_snapshots.go b/src/database/models/orchestrator_vm_snapshots.go similarity index 100% rename from src/data/models/orchestrator_vm_snapshots.go rename to src/database/models/orchestrator_vm_snapshots.go diff --git a/src/data/models/packer_template.go b/src/database/models/packer_template.go similarity index 100% rename from src/data/models/packer_template.go rename to src/database/models/packer_template.go diff --git a/src/data/models/repository.go b/src/database/models/repository.go similarity index 100% rename from src/data/models/repository.go rename to src/database/models/repository.go diff --git a/src/data/models/reverse_proxy.go b/src/database/models/reverse_proxy.go similarity index 100% rename from src/data/models/reverse_proxy.go rename to src/database/models/reverse_proxy.go diff --git a/src/data/models/role.go b/src/database/models/role.go similarity index 100% rename from src/data/models/role.go rename to src/database/models/role.go diff --git a/src/data/models/role_claims.go b/src/database/models/role_claims.go similarity index 100% rename from src/data/models/role_claims.go rename to src/database/models/role_claims.go diff --git a/src/data/models/schema.go b/src/database/models/schema.go similarity index 100% rename from src/data/models/schema.go rename to src/database/models/schema.go diff --git a/src/data/models/tenant.go b/src/database/models/tenant.go similarity index 100% rename from src/data/models/tenant.go rename to src/database/models/tenant.go diff --git a/src/data/models/user.go b/src/database/models/user.go similarity index 100% rename from src/data/models/user.go rename to src/database/models/user.go diff --git a/src/data/models/user_config.go b/src/database/models/user_config.go similarity index 100% rename from src/data/models/user_config.go rename to src/database/models/user_config.go diff --git a/src/data/models/virtual_machine.go b/src/database/models/virtual_machine.go similarity index 100% rename from src/data/models/virtual_machine.go rename to src/database/models/virtual_machine.go diff --git a/src/data/models/virtual_machines.go b/src/database/models/virtual_machines.go similarity index 100% rename from src/data/models/virtual_machines.go rename to src/database/models/virtual_machines.go diff --git a/src/data/models/webauthn_credential.go b/src/database/models/webauthn_credential.go similarity index 100% rename from src/data/models/webauthn_credential.go rename to src/database/models/webauthn_credential.go diff --git a/src/database/stores/_tenant_store_not_needed.go b/src/database/stores/_tenant_store_not_needed.go index f971c5a6..399dc663 100644 --- a/src/database/stores/_tenant_store_not_needed.go +++ b/src/database/stores/_tenant_store_not_needed.go @@ -11,7 +11,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/config" "github.com/Parallels/prl-devops-service/database/common" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/database/filters" "github.com/Parallels/prl-devops-service/database/interfaces" diff --git a/src/database/stores/activity_store.go b/src/database/stores/activity_store.go index 696ce638..4910d5ea 100644 --- a/src/database/stores/activity_store.go +++ b/src/database/stores/activity_store.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/config" diff --git a/src/database/stores/activity_store_test.go b/src/database/stores/activity_store_test.go index fd5a1081..d8047642 100644 --- a/src/database/stores/activity_store_test.go +++ b/src/database/stores/activity_store_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/database/common" "github.com/Parallels/prl-devops-service/database/stores" "github.com/Parallels/prl-devops-service/database/stores/testhelpers" diff --git a/src/database/stores/api_key_store.go b/src/database/stores/api_key_store.go index ce82092c..31d2a0e2 100644 --- a/src/database/stores/api_key_store.go +++ b/src/database/stores/api_key_store.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/config" diff --git a/src/database/stores/api_key_store_test.go b/src/database/stores/api_key_store_test.go index f71a15cf..5498ce7f 100644 --- a/src/database/stores/api_key_store_test.go +++ b/src/database/stores/api_key_store_test.go @@ -5,7 +5,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/database/common" "github.com/Parallels/prl-devops-service/database/stores" "github.com/Parallels/prl-devops-service/database/stores/testhelpers" diff --git a/src/database/stores/auth_service.go b/src/database/stores/auth_service.go index 1b5d4fe7..25725794 100644 --- a/src/database/stores/auth_service.go +++ b/src/database/stores/auth_service.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/database/interfaces" apperrors "github.com/Parallels/prl-devops-service/errors" ) diff --git a/src/database/stores/claim_store.go b/src/database/stores/claim_store.go index d4ae61b8..68caee1e 100644 --- a/src/database/stores/claim_store.go +++ b/src/database/stores/claim_store.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/config" diff --git a/src/database/stores/claim_store_test.go b/src/database/stores/claim_store_test.go index c372abce..1ad418ab 100644 --- a/src/database/stores/claim_store_test.go +++ b/src/database/stores/claim_store_test.go @@ -5,7 +5,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/database/common" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/database/stores" "github.com/Parallels/prl-devops-service/database/stores/testhelpers" logging "github.com/cjlapao/common-go-logger" diff --git a/src/database/stores/configuration_store.go b/src/database/stores/configuration_store.go index 4d7f2ba2..d4d098a7 100644 --- a/src/database/stores/configuration_store.go +++ b/src/database/stores/configuration_store.go @@ -6,7 +6,7 @@ import ( "fmt" "sync" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/config" "github.com/Parallels/prl-devops-service/database/common" diff --git a/src/database/stores/configuration_store_test.go b/src/database/stores/configuration_store_test.go index 91ebb9e7..c42f30ac 100644 --- a/src/database/stores/configuration_store_test.go +++ b/src/database/stores/configuration_store_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/database/common" "github.com/Parallels/prl-devops-service/database/stores" "github.com/Parallels/prl-devops-service/database/stores/testhelpers" diff --git a/src/database/stores/email_store.go b/src/database/stores/email_store.go index df483add..0a84620b 100644 --- a/src/database/stores/email_store.go +++ b/src/database/stores/email_store.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/config" diff --git a/src/database/stores/email_store_test.go b/src/database/stores/email_store_test.go index 7c66b204..51195c21 100644 --- a/src/database/stores/email_store_test.go +++ b/src/database/stores/email_store_test.go @@ -5,7 +5,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/database/common" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/database/stores" "github.com/Parallels/prl-devops-service/database/stores/testhelpers" logging "github.com/cjlapao/common-go-logger" diff --git a/src/database/stores/ip_ban_store.go b/src/database/stores/ip_ban_store.go index 9c8b0b53..80c976b5 100644 --- a/src/database/stores/ip_ban_store.go +++ b/src/database/stores/ip_ban_store.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/config" diff --git a/src/database/stores/ip_ban_store_test.go b/src/database/stores/ip_ban_store_test.go index 6d6238b2..39b9d123 100644 --- a/src/database/stores/ip_ban_store_test.go +++ b/src/database/stores/ip_ban_store_test.go @@ -5,7 +5,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/database/common" "github.com/Parallels/prl-devops-service/database/stores" "github.com/Parallels/prl-devops-service/database/stores/testhelpers" diff --git a/src/database/stores/message_store.go b/src/database/stores/message_store.go index 75915e7e..afe66557 100644 --- a/src/database/stores/message_store.go +++ b/src/database/stores/message_store.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/config" "github.com/Parallels/prl-devops-service/database/common" diff --git a/src/database/stores/message_store_test.go b/src/database/stores/message_store_test.go index 2daa0a0b..ff0d3c80 100644 --- a/src/database/stores/message_store_test.go +++ b/src/database/stores/message_store_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/database/common" "github.com/Parallels/prl-devops-service/database/stores" "github.com/Parallels/prl-devops-service/database/stores/testhelpers" diff --git a/src/database/stores/notification_store.go b/src/database/stores/notification_store.go index 720c0150..845c0a38 100644 --- a/src/database/stores/notification_store.go +++ b/src/database/stores/notification_store.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/config" diff --git a/src/database/stores/notification_store_test.go b/src/database/stores/notification_store_test.go index 3367cb0c..788b84ec 100644 --- a/src/database/stores/notification_store_test.go +++ b/src/database/stores/notification_store_test.go @@ -5,7 +5,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/database/common" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/database/stores" "github.com/Parallels/prl-devops-service/database/stores/testhelpers" logging "github.com/cjlapao/common-go-logger" diff --git a/src/database/stores/role_store.go b/src/database/stores/role_store.go index 661d4d5b..15d68ef0 100644 --- a/src/database/stores/role_store.go +++ b/src/database/stores/role_store.go @@ -9,7 +9,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/config" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/database/common" "github.com/Parallels/prl-devops-service/database/filters" "github.com/Parallels/prl-devops-service/database/interfaces" diff --git a/src/database/stores/testhelpers/db.go b/src/database/stores/testhelpers/db.go index fad97290..e36f195a 100644 --- a/src/database/stores/testhelpers/db.go +++ b/src/database/stores/testhelpers/db.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "gorm.io/driver/sqlite" "gorm.io/gorm" "gorm.io/gorm/logger" diff --git a/src/database/stores/user_store.go b/src/database/stores/user_store.go index 15489e63..01e5b077 100644 --- a/src/database/stores/user_store.go +++ b/src/database/stores/user_store.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/config" diff --git a/src/database/stores/user_store_test.go b/src/database/stores/user_store_test.go index 51443790..1247188d 100644 --- a/src/database/stores/user_store_test.go +++ b/src/database/stores/user_store_test.go @@ -5,7 +5,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/database/common" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/database/stores" "github.com/Parallels/prl-devops-service/database/stores/testhelpers" logging "github.com/cjlapao/common-go-logger" diff --git a/src/database/stores/webauthn_store.go b/src/database/stores/webauthn_store.go index 8dfbab38..b8f04d4a 100644 --- a/src/database/stores/webauthn_store.go +++ b/src/database/stores/webauthn_store.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/config" diff --git a/src/database/stores/webauthn_store_test.go b/src/database/stores/webauthn_store_test.go index 03818026..88172497 100644 --- a/src/database/stores/webauthn_store_test.go +++ b/src/database/stores/webauthn_store_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/database/common" "github.com/Parallels/prl-devops-service/database/stores" "github.com/Parallels/prl-devops-service/database/stores/testhelpers" diff --git a/src/jobs/main.go b/src/jobs/main.go index c047d546..00beb75f 100644 --- a/src/jobs/main.go +++ b/src/jobs/main.go @@ -7,7 +7,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/constants" "github.com/Parallels/prl-devops-service/data" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/mappers" global_models "github.com/Parallels/prl-devops-service/models" "github.com/Parallels/prl-devops-service/serviceprovider" diff --git a/src/jobs/tracker/service.go b/src/jobs/tracker/service.go index 7c87945d..98d8bf01 100644 --- a/src/jobs/tracker/service.go +++ b/src/jobs/tracker/service.go @@ -8,7 +8,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/constants" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" ) var _globalJobProgressService *JobProgressService diff --git a/src/mappers/api_key.go b/src/mappers/api_key.go index 225802e6..41eb8e35 100644 --- a/src/mappers/api_key.go +++ b/src/mappers/api_key.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/api_key_test.go b/src/mappers/api_key_test.go index ba3b0741..1f3fa34e 100644 --- a/src/mappers/api_key_test.go +++ b/src/mappers/api_key_test.go @@ -3,7 +3,7 @@ package mappers import ( "testing" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" "github.com/stretchr/testify/assert" ) diff --git a/src/mappers/catalog.go b/src/mappers/catalog.go index 32b102fb..e428c3fa 100644 --- a/src/mappers/catalog.go +++ b/src/mappers/catalog.go @@ -2,7 +2,7 @@ package mappers import ( catalog_models "github.com/Parallels/prl-devops-service/catalog/models" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/catalog_managers.go b/src/mappers/catalog_managers.go index 3c909ca7..5e68dde6 100644 --- a/src/mappers/catalog_managers.go +++ b/src/mappers/catalog_managers.go @@ -2,7 +2,7 @@ package mappers import ( "github.com/Parallels/prl-devops-service/config" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/models" "github.com/Parallels/prl-devops-service/security" diff --git a/src/mappers/claim.go b/src/mappers/claim.go index ccfbcc95..9e6eccac 100644 --- a/src/mappers/claim.go +++ b/src/mappers/claim.go @@ -4,7 +4,7 @@ import ( "strings" "github.com/Parallels/prl-devops-service/constants" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/effective_claims.go b/src/mappers/effective_claims.go index 47344b5b..f0c3335c 100644 --- a/src/mappers/effective_claims.go +++ b/src/mappers/effective_claims.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/effective_claims_test.go b/src/mappers/effective_claims_test.go index d6e8f806..b52d004c 100644 --- a/src/mappers/effective_claims_test.go +++ b/src/mappers/effective_claims_test.go @@ -3,7 +3,7 @@ package mappers import ( "testing" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/src/mappers/job.go b/src/mappers/job.go index c72af1b6..4f3e03af 100644 --- a/src/mappers/job.go +++ b/src/mappers/job.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" api_models "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/orchestrator.go b/src/mappers/orchestrator.go index 2babf170..cd549ad3 100644 --- a/src/mappers/orchestrator.go +++ b/src/mappers/orchestrator.go @@ -3,7 +3,7 @@ package mappers import ( "net/url" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/packer_template.go b/src/mappers/packer_template.go index 59dd73d1..0124b163 100644 --- a/src/mappers/packer_template.go +++ b/src/mappers/packer_template.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/reverse_proxy.go b/src/mappers/reverse_proxy.go index 5b7627fe..7cad3530 100644 --- a/src/mappers/reverse_proxy.go +++ b/src/mappers/reverse_proxy.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" rp_models "github.com/Parallels/prl-devops-service/reverse_proxy/models" ) diff --git a/src/mappers/reverse_proxy_host.go b/src/mappers/reverse_proxy_host.go index a87cd099..e5a7f85e 100644 --- a/src/mappers/reverse_proxy_host.go +++ b/src/mappers/reverse_proxy_host.go @@ -2,7 +2,7 @@ package mappers import ( config_models "github.com/Parallels/prl-devops-service/config" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/reverse_proxy_host_cors.go b/src/mappers/reverse_proxy_host_cors.go index 6acd9682..82eec5db 100644 --- a/src/mappers/reverse_proxy_host_cors.go +++ b/src/mappers/reverse_proxy_host_cors.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/reverse_proxy_host_http_route.go b/src/mappers/reverse_proxy_host_http_route.go index ff71b434..a7da05f8 100644 --- a/src/mappers/reverse_proxy_host_http_route.go +++ b/src/mappers/reverse_proxy_host_http_route.go @@ -2,7 +2,7 @@ package mappers import ( config_models "github.com/Parallels/prl-devops-service/config" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/reverse_proxy_host_tcp_route.go b/src/mappers/reverse_proxy_host_tcp_route.go index a1195982..92907190 100644 --- a/src/mappers/reverse_proxy_host_tcp_route.go +++ b/src/mappers/reverse_proxy_host_tcp_route.go @@ -2,7 +2,7 @@ package mappers import ( config_models "github.com/Parallels/prl-devops-service/config" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/reverse_proxy_host_tls.go b/src/mappers/reverse_proxy_host_tls.go index 46ea977e..602cb01b 100644 --- a/src/mappers/reverse_proxy_host_tls.go +++ b/src/mappers/reverse_proxy_host_tls.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/role.go b/src/mappers/role.go index d8642bcf..3c31fa4d 100644 --- a/src/mappers/role.go +++ b/src/mappers/role.go @@ -3,7 +3,7 @@ package mappers import ( "strings" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/system.go b/src/mappers/system.go index f0a00681..46e0a958 100644 --- a/src/mappers/system.go +++ b/src/mappers/system.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/t.go b/src/mappers/t.go index 25e7b564..15e36409 100644 --- a/src/mappers/t.go +++ b/src/mappers/t.go @@ -1,7 +1,7 @@ package mappers import ( - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/serviceprovider/apiclient" ) diff --git a/src/mappers/user.go b/src/mappers/user.go index 5630d2ac..ab4d737b 100644 --- a/src/mappers/user.go +++ b/src/mappers/user.go @@ -3,7 +3,7 @@ package mappers import ( "strings" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/user_config.go b/src/mappers/user_config.go index 0be8d8cf..34934ef2 100644 --- a/src/mappers/user_config.go +++ b/src/mappers/user_config.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/virtual_machine.go b/src/mappers/virtual_machine.go index 229d9a5d..e9bc6759 100644 --- a/src/mappers/virtual_machine.go +++ b/src/mappers/virtual_machine.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/virtual_machine_advanced.go b/src/mappers/virtual_machine_advanced.go index 4c42da35..2781daeb 100644 --- a/src/mappers/virtual_machine_advanced.go +++ b/src/mappers/virtual_machine_advanced.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/virtual_machine_cdrom.go b/src/mappers/virtual_machine_cdrom.go index ffa33937..ef465c02 100644 --- a/src/mappers/virtual_machine_cdrom.go +++ b/src/mappers/virtual_machine_cdrom.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/virtual_machine_coherence.go b/src/mappers/virtual_machine_coherence.go index 3d59b9fa..c9ff9e7d 100644 --- a/src/mappers/virtual_machine_coherence.go +++ b/src/mappers/virtual_machine_coherence.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/virtual_machine_cpu.go b/src/mappers/virtual_machine_cpu.go index 86c94fb5..4d6c32d6 100644 --- a/src/mappers/virtual_machine_cpu.go +++ b/src/mappers/virtual_machine_cpu.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/virtual_machine_expiration.go b/src/mappers/virtual_machine_expiration.go index 9f26eea5..e6780b95 100644 --- a/src/mappers/virtual_machine_expiration.go +++ b/src/mappers/virtual_machine_expiration.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/virtual_machine_fullscreen.go b/src/mappers/virtual_machine_fullscreen.go index 7f431d10..437c0d78 100644 --- a/src/mappers/virtual_machine_fullscreen.go +++ b/src/mappers/virtual_machine_fullscreen.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/virtual_machine_guest_shared_folders.go b/src/mappers/virtual_machine_guest_shared_folders.go index e04d01dd..7e175847 100644 --- a/src/mappers/virtual_machine_guest_shared_folders.go +++ b/src/mappers/virtual_machine_guest_shared_folders.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/virtual_machine_guest_tools.go b/src/mappers/virtual_machine_guest_tools.go index 4163f6f4..5ce6b995 100644 --- a/src/mappers/virtual_machine_guest_tools.go +++ b/src/mappers/virtual_machine_guest_tools.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/virtual_machine_hardware.go b/src/mappers/virtual_machine_hardware.go index b65b2191..2799f6c1 100644 --- a/src/mappers/virtual_machine_hardware.go +++ b/src/mappers/virtual_machine_hardware.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/virtual_machine_hdd.go b/src/mappers/virtual_machine_hdd.go index 2c7deb6e..10e3ca85 100644 --- a/src/mappers/virtual_machine_hdd.go +++ b/src/mappers/virtual_machine_hdd.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/virtual_machine_memory.go b/src/mappers/virtual_machine_memory.go index 31ca8f0f..55716d62 100644 --- a/src/mappers/virtual_machine_memory.go +++ b/src/mappers/virtual_machine_memory.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/virtual_machine_memory_quota.go b/src/mappers/virtual_machine_memory_quota.go index ca8c2f14..fb101d01 100644 --- a/src/mappers/virtual_machine_memory_quota.go +++ b/src/mappers/virtual_machine_memory_quota.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/virtual_machine_miscellaneous_sharing.go b/src/mappers/virtual_machine_miscellaneous_sharing.go index b1d062ad..b607bda0 100644 --- a/src/mappers/virtual_machine_miscellaneous_sharing.go +++ b/src/mappers/virtual_machine_miscellaneous_sharing.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/virtual_machine_modality.go b/src/mappers/virtual_machine_modality.go index 7b15ef84..8b50562d 100644 --- a/src/mappers/virtual_machine_modality.go +++ b/src/mappers/virtual_machine_modality.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/virtual_machine_mouse_and_keyboard.go b/src/mappers/virtual_machine_mouse_and_keyboard.go index 1ef18e8c..d56c3128 100644 --- a/src/mappers/virtual_machine_mouse_and_keyboard.go +++ b/src/mappers/virtual_machine_mouse_and_keyboard.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/virtual_machine_net.go b/src/mappers/virtual_machine_net.go index e01de5c3..2f93231b 100644 --- a/src/mappers/virtual_machine_net.go +++ b/src/mappers/virtual_machine_net.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/virtual_machine_network_information.go b/src/mappers/virtual_machine_network_information.go index 25e33ba9..1cb80913 100644 --- a/src/mappers/virtual_machine_network_information.go +++ b/src/mappers/virtual_machine_network_information.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/virtual_machine_optimization.go b/src/mappers/virtual_machine_optimization.go index 18fe8432..817bc6a2 100644 --- a/src/mappers/virtual_machine_optimization.go +++ b/src/mappers/virtual_machine_optimization.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/virtual_machine_print_management.go b/src/mappers/virtual_machine_print_management.go index 7d7ea77b..5a93de3b 100644 --- a/src/mappers/virtual_machine_print_management.go +++ b/src/mappers/virtual_machine_print_management.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/virtual_machine_security.go b/src/mappers/virtual_machine_security.go index 6bec43ea..37033cc1 100644 --- a/src/mappers/virtual_machine_security.go +++ b/src/mappers/virtual_machine_security.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/virtual_machine_shared_applications.go b/src/mappers/virtual_machine_shared_applications.go index f3b51b62..ffcb2229 100644 --- a/src/mappers/virtual_machine_shared_applications.go +++ b/src/mappers/virtual_machine_shared_applications.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/virtual_machine_smart_mount.go b/src/mappers/virtual_machine_smart_mount.go index fc4eacc6..9f50d4fc 100644 --- a/src/mappers/virtual_machine_smart_mount.go +++ b/src/mappers/virtual_machine_smart_mount.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/virtual_machine_smbios_settings.go b/src/mappers/virtual_machine_smbios_settings.go index a5462fbe..16e37bad 100644 --- a/src/mappers/virtual_machine_smbios_settings.go +++ b/src/mappers/virtual_machine_smbios_settings.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/virtual_machine_sound.go b/src/mappers/virtual_machine_sound.go index 68d52f02..b1652603 100644 --- a/src/mappers/virtual_machine_sound.go +++ b/src/mappers/virtual_machine_sound.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/virtual_machine_startup_and_shutdown.go b/src/mappers/virtual_machine_startup_and_shutdown.go index dfa7d925..9b7a9bfe 100644 --- a/src/mappers/virtual_machine_startup_and_shutdown.go +++ b/src/mappers/virtual_machine_startup_and_shutdown.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/virtual_machine_time_synchronization.go b/src/mappers/virtual_machine_time_synchronization.go index d8355551..466a0220 100644 --- a/src/mappers/virtual_machine_time_synchronization.go +++ b/src/mappers/virtual_machine_time_synchronization.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/virtual_machine_travel_mode.go b/src/mappers/virtual_machine_travel_mode.go index 6712b575..1d43914a 100644 --- a/src/mappers/virtual_machine_travel_mode.go +++ b/src/mappers/virtual_machine_travel_mode.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/virtual_machine_usb_and_bluetooth.go b/src/mappers/virtual_machine_usb_and_bluetooth.go index 19f80761..e0c9bf48 100644 --- a/src/mappers/virtual_machine_usb_and_bluetooth.go +++ b/src/mappers/virtual_machine_usb_and_bluetooth.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/virtual_machine_video.go b/src/mappers/virtual_machine_video.go index 21935183..bec132a6 100644 --- a/src/mappers/virtual_machine_video.go +++ b/src/mappers/virtual_machine_video.go @@ -1,7 +1,7 @@ package mappers import ( - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/mappers/vm_snapshots.go b/src/mappers/vm_snapshots.go index d4ce43f8..85d4c83b 100644 --- a/src/mappers/vm_snapshots.go +++ b/src/mappers/vm_snapshots.go @@ -3,7 +3,7 @@ package mappers import ( "strings" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" apiModels "github.com/Parallels/prl-devops-service/models" ) diff --git a/src/orchestrator/clone_host_virtual_machine.go b/src/orchestrator/clone_host_virtual_machine.go index 3dddc8e6..f09ba0bf 100644 --- a/src/orchestrator/clone_host_virtual_machine.go +++ b/src/orchestrator/clone_host_virtual_machine.go @@ -4,7 +4,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/models" diff --git a/src/orchestrator/common.go b/src/orchestrator/common.go index 1a5a04a6..06f1be6a 100644 --- a/src/orchestrator/common.go +++ b/src/orchestrator/common.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/serviceprovider/apiclient" ) diff --git a/src/orchestrator/configure_host_virtual_machine.go b/src/orchestrator/configure_host_virtual_machine.go index 11fa60e4..03abe399 100644 --- a/src/orchestrator/configure_host_virtual_machine.go +++ b/src/orchestrator/configure_host_virtual_machine.go @@ -4,7 +4,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/models" diff --git a/src/orchestrator/create_host_reverse_proxy_host.go b/src/orchestrator/create_host_reverse_proxy_host.go index ce844b4a..03889cc5 100644 --- a/src/orchestrator/create_host_reverse_proxy_host.go +++ b/src/orchestrator/create_host_reverse_proxy_host.go @@ -4,7 +4,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/models" "github.com/Parallels/prl-devops-service/serviceprovider" diff --git a/src/orchestrator/create_host_virtual_machine.go b/src/orchestrator/create_host_virtual_machine.go index 86133bc2..6e06de1e 100644 --- a/src/orchestrator/create_host_virtual_machine.go +++ b/src/orchestrator/create_host_virtual_machine.go @@ -11,7 +11,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" catalog_models "github.com/Parallels/prl-devops-service/catalog/models" "github.com/Parallels/prl-devops-service/constants" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/jobs" diff --git a/src/orchestrator/create_host_virtual_machine_test.go b/src/orchestrator/create_host_virtual_machine_test.go index 0cbad78d..a88001bc 100644 --- a/src/orchestrator/create_host_virtual_machine_test.go +++ b/src/orchestrator/create_host_virtual_machine_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" "github.com/stretchr/testify/assert" ) diff --git a/src/orchestrator/delete_host_catalog_cache.go b/src/orchestrator/delete_host_catalog_cache.go index 7ebfd412..19839ed1 100644 --- a/src/orchestrator/delete_host_catalog_cache.go +++ b/src/orchestrator/delete_host_catalog_cache.go @@ -4,7 +4,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/serviceprovider" diff --git a/src/orchestrator/delete_host_reverse_proxy_host.go b/src/orchestrator/delete_host_reverse_proxy_host.go index c32cff12..6dee7a4e 100644 --- a/src/orchestrator/delete_host_reverse_proxy_host.go +++ b/src/orchestrator/delete_host_reverse_proxy_host.go @@ -4,7 +4,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/serviceprovider" diff --git a/src/orchestrator/delete_host_reverse_proxy_host_http_route.go b/src/orchestrator/delete_host_reverse_proxy_host_http_route.go index 519479b2..84411b8d 100644 --- a/src/orchestrator/delete_host_reverse_proxy_host_http_route.go +++ b/src/orchestrator/delete_host_reverse_proxy_host_http_route.go @@ -4,7 +4,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/serviceprovider" diff --git a/src/orchestrator/delete_host_virtual_machine.go b/src/orchestrator/delete_host_virtual_machine.go index bd4628b3..7d1859ed 100644 --- a/src/orchestrator/delete_host_virtual_machine.go +++ b/src/orchestrator/delete_host_virtual_machine.go @@ -5,7 +5,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/serviceprovider" diff --git a/src/orchestrator/disable_host_reverse_proxy.go b/src/orchestrator/disable_host_reverse_proxy.go index 934044d3..27340779 100644 --- a/src/orchestrator/disable_host_reverse_proxy.go +++ b/src/orchestrator/disable_host_reverse_proxy.go @@ -4,7 +4,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" ) diff --git a/src/orchestrator/enable_disable_host.go b/src/orchestrator/enable_disable_host.go index 574971a9..3348b70c 100644 --- a/src/orchestrator/enable_disable_host.go +++ b/src/orchestrator/enable_disable_host.go @@ -2,7 +2,7 @@ package orchestrator import ( "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/serviceprovider" ) diff --git a/src/orchestrator/enable_host_reverse_proxy.go b/src/orchestrator/enable_host_reverse_proxy.go index f577152c..62c667ea 100644 --- a/src/orchestrator/enable_host_reverse_proxy.go +++ b/src/orchestrator/enable_host_reverse_proxy.go @@ -4,7 +4,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" ) diff --git a/src/orchestrator/execute_on_host_virtual_machine.go b/src/orchestrator/execute_on_host_virtual_machine.go index 625e02ee..6abbebad 100644 --- a/src/orchestrator/execute_on_host_virtual_machine.go +++ b/src/orchestrator/execute_on_host_virtual_machine.go @@ -4,7 +4,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/models" diff --git a/src/orchestrator/get_host_catalog_cache.go b/src/orchestrator/get_host_catalog_cache.go index 2acead02..3fb3f975 100644 --- a/src/orchestrator/get_host_catalog_cache.go +++ b/src/orchestrator/get_host_catalog_cache.go @@ -2,7 +2,7 @@ package orchestrator import ( "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" api_models "github.com/Parallels/prl-devops-service/models" diff --git a/src/orchestrator/get_host_disk_space_info.go b/src/orchestrator/get_host_disk_space_info.go index 4cf854f6..67a49bfb 100644 --- a/src/orchestrator/get_host_disk_space_info.go +++ b/src/orchestrator/get_host_disk_space_info.go @@ -4,7 +4,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/models" diff --git a/src/orchestrator/get_host_hardware_info.go b/src/orchestrator/get_host_hardware_info.go index 8c49ed82..98e10bc1 100644 --- a/src/orchestrator/get_host_hardware_info.go +++ b/src/orchestrator/get_host_hardware_info.go @@ -3,7 +3,7 @@ package orchestrator import ( "time" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" api_models "github.com/Parallels/prl-devops-service/models" diff --git a/src/orchestrator/get_host_logs.go b/src/orchestrator/get_host_logs.go index f7145e44..62d82f11 100644 --- a/src/orchestrator/get_host_logs.go +++ b/src/orchestrator/get_host_logs.go @@ -2,7 +2,7 @@ package orchestrator import ( "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/serviceprovider" diff --git a/src/orchestrator/get_host_reverse_proxy_config.go b/src/orchestrator/get_host_reverse_proxy_config.go index 224292a7..ede1dfe6 100644 --- a/src/orchestrator/get_host_reverse_proxy_config.go +++ b/src/orchestrator/get_host_reverse_proxy_config.go @@ -4,8 +4,8 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" - data_models "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" ) diff --git a/src/orchestrator/get_host_reverse_proxy_hosts.go b/src/orchestrator/get_host_reverse_proxy_hosts.go index c1a26e79..4b9fea2c 100644 --- a/src/orchestrator/get_host_reverse_proxy_hosts.go +++ b/src/orchestrator/get_host_reverse_proxy_hosts.go @@ -5,8 +5,8 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" - data_models "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" ) diff --git a/src/orchestrator/get_host_virtual_machine_status.go b/src/orchestrator/get_host_virtual_machine_status.go index 25a5435e..00608b6e 100644 --- a/src/orchestrator/get_host_virtual_machine_status.go +++ b/src/orchestrator/get_host_virtual_machine_status.go @@ -2,7 +2,7 @@ package orchestrator import ( "github.com/Parallels/prl-devops-service/basecontext" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/models" diff --git a/src/orchestrator/get_host_virtual_machines.go b/src/orchestrator/get_host_virtual_machines.go index 2a7c1eb4..fde7214d 100644 --- a/src/orchestrator/get_host_virtual_machines.go +++ b/src/orchestrator/get_host_virtual_machines.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" api_models "github.com/Parallels/prl-devops-service/models" diff --git a/src/orchestrator/get_hosts.go b/src/orchestrator/get_hosts.go index cb4d3859..4a00413b 100644 --- a/src/orchestrator/get_hosts.go +++ b/src/orchestrator/get_hosts.go @@ -5,7 +5,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/serviceprovider" ) diff --git a/src/orchestrator/get_hosts_health_check.go b/src/orchestrator/get_hosts_health_check.go index 323ea97f..ee34e2b1 100644 --- a/src/orchestrator/get_hosts_health_check.go +++ b/src/orchestrator/get_hosts_health_check.go @@ -9,7 +9,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/config" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" api_models "github.com/Parallels/prl-devops-service/models" diff --git a/src/orchestrator/get_hosts_health_check_test.go b/src/orchestrator/get_hosts_health_check_test.go index 1385c250..1cc32eb4 100644 --- a/src/orchestrator/get_hosts_health_check_test.go +++ b/src/orchestrator/get_hosts_health_check_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/restapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/src/orchestrator/get_orchestrator_resources.go b/src/orchestrator/get_orchestrator_resources.go index 47f80276..0fdb78c8 100644 --- a/src/orchestrator/get_orchestrator_resources.go +++ b/src/orchestrator/get_orchestrator_resources.go @@ -2,7 +2,7 @@ package orchestrator import ( "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/serviceprovider" ) diff --git a/src/orchestrator/get_virtual_machines.go b/src/orchestrator/get_virtual_machines.go index f9799348..605cf27d 100644 --- a/src/orchestrator/get_virtual_machines.go +++ b/src/orchestrator/get_virtual_machines.go @@ -5,7 +5,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/serviceprovider" ) diff --git a/src/orchestrator/handlers/host_job_event_handler.go b/src/orchestrator/handlers/host_job_event_handler.go index a4956831..0e0e29e4 100644 --- a/src/orchestrator/handlers/host_job_event_handler.go +++ b/src/orchestrator/handlers/host_job_event_handler.go @@ -7,7 +7,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/constants" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/jobs" "github.com/Parallels/prl-devops-service/models" "github.com/Parallels/prl-devops-service/orchestrator/interfaces" diff --git a/src/orchestrator/handlers/pdfm_event_handler.go b/src/orchestrator/handlers/pdfm_event_handler.go index 01ade995..2972e7e7 100644 --- a/src/orchestrator/handlers/pdfm_event_handler.go +++ b/src/orchestrator/handlers/pdfm_event_handler.go @@ -7,7 +7,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/constants" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/mappers" "github.com/Parallels/prl-devops-service/models" "github.com/Parallels/prl-devops-service/orchestrator/interfaces" diff --git a/src/orchestrator/host_virtual_machine_snapshots.go b/src/orchestrator/host_virtual_machine_snapshots.go index 83fdfbe0..a9fb830f 100644 --- a/src/orchestrator/host_virtual_machine_snapshots.go +++ b/src/orchestrator/host_virtual_machine_snapshots.go @@ -4,7 +4,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/mappers" diff --git a/src/orchestrator/host_websocket_manager.go b/src/orchestrator/host_websocket_manager.go index 4cc1eedc..c7a8d8ac 100644 --- a/src/orchestrator/host_websocket_manager.go +++ b/src/orchestrator/host_websocket_manager.go @@ -7,7 +7,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/constants" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" event "github.com/Parallels/prl-devops-service/models" "github.com/Parallels/prl-devops-service/orchestrator/interfaces" "github.com/Parallels/prl-devops-service/serviceprovider" diff --git a/src/orchestrator/host_websocket_manager_test.go b/src/orchestrator/host_websocket_manager_test.go index 60907e44..c72836c5 100644 --- a/src/orchestrator/host_websocket_manager_test.go +++ b/src/orchestrator/host_websocket_manager_test.go @@ -6,7 +6,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/constants" - dataModels "github.com/Parallels/prl-devops-service/data/models" + dataModels "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/orchestrator/interfaces" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/src/orchestrator/main.go b/src/orchestrator/main.go index 9f79d912..79703a07 100644 --- a/src/orchestrator/main.go +++ b/src/orchestrator/main.go @@ -9,7 +9,7 @@ import ( "github.com/Parallels/prl-devops-service/config" "github.com/Parallels/prl-devops-service/constants" "github.com/Parallels/prl-devops-service/data" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/mappers" apimodels "github.com/Parallels/prl-devops-service/models" "github.com/Parallels/prl-devops-service/orchestrator/handlers" diff --git a/src/orchestrator/pause_host_virtual_machine.go b/src/orchestrator/pause_host_virtual_machine.go index fc99d9e2..4aa8644e 100644 --- a/src/orchestrator/pause_host_virtual_machine.go +++ b/src/orchestrator/pause_host_virtual_machine.go @@ -4,7 +4,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/models" diff --git a/src/orchestrator/register_host.go b/src/orchestrator/register_host.go index ac5c69e8..c7e360d1 100644 --- a/src/orchestrator/register_host.go +++ b/src/orchestrator/register_host.go @@ -3,7 +3,7 @@ package orchestrator import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/constants" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/mappers" apimodels "github.com/Parallels/prl-devops-service/models" "github.com/Parallels/prl-devops-service/serviceprovider" diff --git a/src/orchestrator/register_host_virtual_machine.go b/src/orchestrator/register_host_virtual_machine.go index b31c0792..452cdc3b 100644 --- a/src/orchestrator/register_host_virtual_machine.go +++ b/src/orchestrator/register_host_virtual_machine.go @@ -4,7 +4,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/models" diff --git a/src/orchestrator/rename_host_virtual_machine.go b/src/orchestrator/rename_host_virtual_machine.go index f3847c81..54d03488 100644 --- a/src/orchestrator/rename_host_virtual_machine.go +++ b/src/orchestrator/rename_host_virtual_machine.go @@ -4,7 +4,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/models" diff --git a/src/orchestrator/reset_host_virtual_machine.go b/src/orchestrator/reset_host_virtual_machine.go index adc10820..be9b8db7 100644 --- a/src/orchestrator/reset_host_virtual_machine.go +++ b/src/orchestrator/reset_host_virtual_machine.go @@ -4,7 +4,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/models" diff --git a/src/orchestrator/restart_host_reverse_proxy.go b/src/orchestrator/restart_host_reverse_proxy.go index d3610372..04b5ab19 100644 --- a/src/orchestrator/restart_host_reverse_proxy.go +++ b/src/orchestrator/restart_host_reverse_proxy.go @@ -4,7 +4,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" ) diff --git a/src/orchestrator/restart_host_virtual_machine.go b/src/orchestrator/restart_host_virtual_machine.go index 887b0f44..87cf5366 100644 --- a/src/orchestrator/restart_host_virtual_machine.go +++ b/src/orchestrator/restart_host_virtual_machine.go @@ -4,7 +4,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/models" diff --git a/src/orchestrator/resume_host_virtual_machine.go b/src/orchestrator/resume_host_virtual_machine.go index adaa473c..c2ec017b 100644 --- a/src/orchestrator/resume_host_virtual_machine.go +++ b/src/orchestrator/resume_host_virtual_machine.go @@ -4,7 +4,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/models" diff --git a/src/orchestrator/start_host_virtual_machine.go b/src/orchestrator/start_host_virtual_machine.go index 724d1e85..5d2d9da7 100644 --- a/src/orchestrator/start_host_virtual_machine.go +++ b/src/orchestrator/start_host_virtual_machine.go @@ -4,7 +4,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/models" diff --git a/src/orchestrator/stop_host_virtual_machine.go b/src/orchestrator/stop_host_virtual_machine.go index fca3fbbb..bde30243 100644 --- a/src/orchestrator/stop_host_virtual_machine.go +++ b/src/orchestrator/stop_host_virtual_machine.go @@ -5,7 +5,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/models" diff --git a/src/orchestrator/suspend_host_virtual_machine.go b/src/orchestrator/suspend_host_virtual_machine.go index 6837315b..b4ffe13c 100644 --- a/src/orchestrator/suspend_host_virtual_machine.go +++ b/src/orchestrator/suspend_host_virtual_machine.go @@ -4,7 +4,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/models" diff --git a/src/orchestrator/unregister_host_virtual_machine.go b/src/orchestrator/unregister_host_virtual_machine.go index 1e75ddb5..e3a0e22b 100644 --- a/src/orchestrator/unregister_host_virtual_machine.go +++ b/src/orchestrator/unregister_host_virtual_machine.go @@ -4,7 +4,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/models" diff --git a/src/orchestrator/update_host.go b/src/orchestrator/update_host.go index 7cafa92c..89deab1a 100644 --- a/src/orchestrator/update_host.go +++ b/src/orchestrator/update_host.go @@ -4,7 +4,7 @@ import ( "strings" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/mappers" "github.com/Parallels/prl-devops-service/serviceprovider" ) diff --git a/src/orchestrator/update_host_reverse_proxy_host.go b/src/orchestrator/update_host_reverse_proxy_host.go index 07cbd703..cbd89078 100644 --- a/src/orchestrator/update_host_reverse_proxy_host.go +++ b/src/orchestrator/update_host_reverse_proxy_host.go @@ -4,7 +4,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/models" "github.com/Parallels/prl-devops-service/serviceprovider" diff --git a/src/orchestrator/update_host_reverse_proxy_host_tcp_route.go b/src/orchestrator/update_host_reverse_proxy_host_tcp_route.go index 2a5c3383..af37b573 100644 --- a/src/orchestrator/update_host_reverse_proxy_host_tcp_route.go +++ b/src/orchestrator/update_host_reverse_proxy_host_tcp_route.go @@ -4,7 +4,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/models" "github.com/Parallels/prl-devops-service/serviceprovider" diff --git a/src/orchestrator/upsert_host_reverse_proxy_host_http_route.go b/src/orchestrator/upsert_host_reverse_proxy_host_http_route.go index 65bfc146..a68dfe09 100644 --- a/src/orchestrator/upsert_host_reverse_proxy_host_http_route.go +++ b/src/orchestrator/upsert_host_reverse_proxy_host_http_route.go @@ -4,7 +4,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/models" "github.com/Parallels/prl-devops-service/serviceprovider" diff --git a/src/orchestrator/websocket_client.go b/src/orchestrator/websocket_client.go index 96ee5f74..cd0e88a0 100644 --- a/src/orchestrator/websocket_client.go +++ b/src/orchestrator/websocket_client.go @@ -13,7 +13,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/config" "github.com/Parallels/prl-devops-service/constants" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/helpers" api_models "github.com/Parallels/prl-devops-service/models" "github.com/Parallels/prl-devops-service/serviceprovider" diff --git a/src/restapi/apikey_authorization_middleware_test.go b/src/restapi/apikey_authorization_middleware_test.go index bc9d349c..adc62896 100644 --- a/src/restapi/apikey_authorization_middleware_test.go +++ b/src/restapi/apikey_authorization_middleware_test.go @@ -12,7 +12,7 @@ import ( "github.com/Parallels/prl-devops-service/common" "github.com/Parallels/prl-devops-service/constants" "github.com/Parallels/prl-devops-service/data" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/serviceprovider" log "github.com/cjlapao/common-go-logger" "github.com/stretchr/testify/assert" diff --git a/src/restapi/token_authorization_middleware.go b/src/restapi/token_authorization_middleware.go index f9c75664..76df3403 100644 --- a/src/restapi/token_authorization_middleware.go +++ b/src/restapi/token_authorization_middleware.go @@ -9,7 +9,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/constants" - data_modules "github.com/Parallels/prl-devops-service/data/models" + data_modules "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/mappers" "github.com/Parallels/prl-devops-service/models" "github.com/Parallels/prl-devops-service/security/jwt" diff --git a/src/restapi/token_authorization_middleware_test.go b/src/restapi/token_authorization_middleware_test.go index 66997e9f..55bcf138 100644 --- a/src/restapi/token_authorization_middleware_test.go +++ b/src/restapi/token_authorization_middleware_test.go @@ -10,7 +10,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/constants" "github.com/Parallels/prl-devops-service/data" - data_modules "github.com/Parallels/prl-devops-service/data/models" + data_modules "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/security/jwt" "github.com/Parallels/prl-devops-service/serviceprovider" "github.com/stretchr/testify/assert" diff --git a/src/reverse_proxy/main.go b/src/reverse_proxy/main.go index 8aa89d27..5135e1c3 100644 --- a/src/reverse_proxy/main.go +++ b/src/reverse_proxy/main.go @@ -20,7 +20,7 @@ import ( "github.com/Parallels/prl-devops-service/config" "github.com/Parallels/prl-devops-service/constants" "github.com/Parallels/prl-devops-service/data" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/mappers" global_models "github.com/Parallels/prl-devops-service/models" diff --git a/src/security/apikey/apikey.go b/src/security/apikey/apikey.go index 62e78906..15d323f2 100644 --- a/src/security/apikey/apikey.go +++ b/src/security/apikey/apikey.go @@ -6,7 +6,7 @@ import ( "time" "github.com/Parallels/prl-devops-service/basecontext" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/security/password" ) diff --git a/src/serviceprovider/parallelsdesktop/event_monitor.go b/src/serviceprovider/parallelsdesktop/event_monitor.go index bfb2218c..0d797368 100644 --- a/src/serviceprovider/parallelsdesktop/event_monitor.go +++ b/src/serviceprovider/parallelsdesktop/event_monitor.go @@ -11,7 +11,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/config" "github.com/Parallels/prl-devops-service/constants" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/mappers" "github.com/Parallels/prl-devops-service/models" diff --git a/src/serviceprovider/parallelsdesktop/main.go b/src/serviceprovider/parallelsdesktop/main.go index 3d39ee8f..d6f69c2d 100644 --- a/src/serviceprovider/parallelsdesktop/main.go +++ b/src/serviceprovider/parallelsdesktop/main.go @@ -24,7 +24,7 @@ import ( "github.com/Parallels/prl-devops-service/config" "github.com/Parallels/prl-devops-service/constants" "github.com/Parallels/prl-devops-service/data" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/mappers" diff --git a/src/startup/main.go b/src/startup/main.go index dd24e936..3e11bf8e 100644 --- a/src/startup/main.go +++ b/src/startup/main.go @@ -7,8 +7,8 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/config" "github.com/Parallels/prl-devops-service/constants" - "github.com/Parallels/prl-devops-service/data/models" - data_models "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/errors" "github.com/Parallels/prl-devops-service/helpers" "github.com/Parallels/prl-devops-service/install" diff --git a/src/startup/seeds/claims.go b/src/startup/seeds/claims.go index 9e9421d2..aec44a5f 100644 --- a/src/startup/seeds/claims.go +++ b/src/startup/seeds/claims.go @@ -4,7 +4,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/common" "github.com/Parallels/prl-devops-service/constants" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/serviceprovider" ) diff --git a/src/startup/seeds/packertemplates/kali_linux_2023_3.go b/src/startup/seeds/packertemplates/kali_linux_2023_3.go index 1aee7995..641a721d 100644 --- a/src/startup/seeds/packertemplates/kali_linux_2023_3.go +++ b/src/startup/seeds/packertemplates/kali_linux_2023_3.go @@ -5,7 +5,7 @@ import ( "github.com/Parallels/prl-devops-service/common" "github.com/Parallels/prl-devops-service/constants" "github.com/Parallels/prl-devops-service/data" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" ) func AddKaliLinux2023_3_gnome(ctx *basecontext.BaseContext, svc *data.JsonDatabase) error { diff --git a/src/startup/seeds/packertemplates/macos_14_0.go b/src/startup/seeds/packertemplates/macos_14_0.go index 56ce4f96..a86d1064 100644 --- a/src/startup/seeds/packertemplates/macos_14_0.go +++ b/src/startup/seeds/packertemplates/macos_14_0.go @@ -5,7 +5,7 @@ import ( "github.com/Parallels/prl-devops-service/common" "github.com/Parallels/prl-devops-service/constants" "github.com/Parallels/prl-devops-service/data" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" ) func AddMacOs14_0Manual(ctx *basecontext.BaseContext, svc *data.JsonDatabase) error { diff --git a/src/startup/seeds/packertemplates/ubuntu_23_04.go b/src/startup/seeds/packertemplates/ubuntu_23_04.go index 74ccc075..68294169 100644 --- a/src/startup/seeds/packertemplates/ubuntu_23_04.go +++ b/src/startup/seeds/packertemplates/ubuntu_23_04.go @@ -5,7 +5,7 @@ import ( "github.com/Parallels/prl-devops-service/common" "github.com/Parallels/prl-devops-service/constants" "github.com/Parallels/prl-devops-service/data" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" ) func AddUbuntu23_04(ctx *basecontext.BaseContext, svc *data.JsonDatabase) error { diff --git a/src/startup/seeds/roles.go b/src/startup/seeds/roles.go index d6eb878b..92ff38d5 100644 --- a/src/startup/seeds/roles.go +++ b/src/startup/seeds/roles.go @@ -4,7 +4,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/common" "github.com/Parallels/prl-devops-service/constants" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/serviceprovider" ) diff --git a/src/startup/seeds/users.go b/src/startup/seeds/users.go index e1752125..5711f61e 100644 --- a/src/startup/seeds/users.go +++ b/src/startup/seeds/users.go @@ -5,7 +5,7 @@ import ( "github.com/Parallels/prl-devops-service/common" "github.com/Parallels/prl-devops-service/config" "github.com/Parallels/prl-devops-service/constants" - "github.com/Parallels/prl-devops-service/data/models" + "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/security/password" "github.com/Parallels/prl-devops-service/serviceprovider" cryptorand "github.com/cjlapao/common-go-cryptorand" diff --git a/src/tests/controllers/orchestrator_sync_test.go b/src/tests/controllers/orchestrator_sync_test.go index 09345575..4fbf5f02 100644 --- a/src/tests/controllers/orchestrator_sync_test.go +++ b/src/tests/controllers/orchestrator_sync_test.go @@ -10,7 +10,7 @@ import ( "github.com/Parallels/prl-devops-service/basecontext" "github.com/Parallels/prl-devops-service/controllers" - data_models "github.com/Parallels/prl-devops-service/data/models" + data_models "github.com/Parallels/prl-devops-service/database/models" "github.com/Parallels/prl-devops-service/models" "github.com/Parallels/prl-devops-service/serviceprovider" "github.com/stretchr/testify/assert"