DevFW-CICD/garm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Disable the web UI tests for now

Browse source 
fixes for the tests will be added in a later PR

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
This commit is contained in:
Gabriel Adrian Samfira 2025-10-08 19:09:26 +00:00 • committed by Gabriel
parent 73b330467b
commit 6361e19821
3 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
database/sql/file_store.go
View file

@ -24,7 +24,7 @@ import (
func (s *sqlDatabase) CreateFileObject(ctx context.Context, param params.CreateFileObjectParams, reader io.Reader) (fileObjParam params.FileObject, err error) {
// Save the file to temporary storage first. This allows us to accept the entire file, even over
// a slow connection, without locking the database as we stream the file to the DB.
// SQLite will lock the entire database (including for readers) when the data is being commited.
// SQLite will lock the entire database (including for readers) when the data is being committed.
tmpFile, err := util.GetTmpFileHandle("")
if err != nil {
return params.FileObject{}, fmt.Errorf("failed to create tmp file: %w", err)
@ -39,7 +39,7 @@ func (s *sqlDatabase) CreateFileObject(ctx context.Context, param params.CreateF
if err := tmpFile.Sync(); err != nil {
return params.FileObject{}, fmt.Errorf("failed to flush data to disk: %w", err)
}
// File has been transfered. We need to seek to the beginning of the file. This same handler will be used
// File has been transferred. We need to seek to the beginning of the file. This same handler will be used
// to streab the data to the database.
if _, err := tmpFile.Seek(0, 0); err != nil {
return params.FileObject{}, fmt.Errorf("failed to seek to beginning: %w", err)
@ -96,12 +96,11 @@ func (s *sqlDatabase) CreateFileObject(ctx context.Context, param params.CreateF
}
return nil
})
if err != nil {
return params.FileObject{}, fmt.Errorf("failed to create database entry for blob: %w", err)
}
// Stream file to blob and compute SHA256
conn, err := s.objectsSqlDB.Conn(ctx)
conn, err := s.objectsSQLDB.Conn(ctx)
if err != nil {
return params.FileObject{}, fmt.Errorf("failed to get connection from pool: %w", err)
}
@ -339,7 +338,7 @@ func (s *sqlDatabase) SearchFileObjectByTags(_ context.Context, tags []string, p
// OpenFileObjectContent opens a blob for reading and returns an io.ReadCloser
func (s *sqlDatabase) OpenFileObjectContent(ctx context.Context, objID uint) (io.ReadCloser, error) {
conn, err := s.objectsSqlDB.Conn(ctx)
conn, err := s.objectsSQLDB.Conn(ctx)
if err != nil {
return nil, fmt.Errorf("failed to get connection: %w", err)
}

6
database/sql/sql.go
View file

@ -112,12 +112,12 @@ func NewSQLDatabase(ctx context.Context, cfg config.Database) (common.Store, err
return nil, fmt.Errorf("error creating objects DB connection: %w", err)
}
objectsSqlDB, err := objectsConn.DB()
objectsSQLDB, err := objectsConn.DB()
if err != nil {
return nil, fmt.Errorf("failed to get underlying objects database connection: %w", err)
}
db.objectsConn = objectsConn
db.objectsSqlDB = objectsSqlDB
db.objectsSQLDB = objectsSQLDB
}
if err := db.migrateDB(); err != nil {
@ -132,7 +132,7 @@ type sqlDatabase struct {
// objectsConn is a separate GORM connection to the objects database
objectsConn *gorm.DB
objectsSqlDB *sql.DB
objectsSQLDB *sql.DB
ctx context.Context
cfg config.Database