Skip to content

chore(deps): upgrade Gorm and fix tests #1342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ecrupper merged 2 commits into from
Aug 26, 2025
Merged

chore(deps): upgrade Gorm and fix tests #1342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa8ae3b
chore(deps): upgrade Gorm and fix tests
ecrupper Aug 25, 2025
4ab6cc3
gci
ecrupper Aug 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions database/build/build_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ import (

"github.com/DATA-DOG/go-sqlmock"
"github.com/sirupsen/logrus"
"gorm.io/driver/postgres"
"gorm.io/driver/sqlite"
"gorm.io/gorm"

"github.com/go-vela/server/database/testutils"
)

func TestBuild_New(t *testing.T) {
Expand All @@ -34,7 +35,7 @@ func TestBuild_New(t *testing.T) {

_config := &gorm.Config{SkipDefaultTransaction: true}

_postgres, err := gorm.Open(postgres.New(postgres.Config{Conn: _sql}), _config)
_postgres, err := testutils.TestPostgresGormInit(_sql)
if err != nil {
t.Errorf("unable to create new postgres database: %v", err)
}
Expand Down Expand Up @@ -157,13 +158,7 @@ func testPostgres(t *testing.T) (*Engine, sqlmock.Sqlmock) {
_mock.ExpectExec(CreateRepoIDIndex).WillReturnResult(sqlmock.NewResult(1, 1))
_mock.ExpectExec(CreateStatusIndex).WillReturnResult(sqlmock.NewResult(1, 1))

// create the new mock Postgres database client
//
// https://pkg.go.dev/gorm.io/gorm#Open
_postgres, err := gorm.Open(
postgres.New(postgres.Config{Conn: _sql}),
&gorm.Config{SkipDefaultTransaction: true},
)
_postgres, err := testutils.TestPostgresGormInit(_sql)
if err != nil {
t.Errorf("unable to create new postgres database: %v", err)
}
Expand Down
10 changes: 4 additions & 6 deletions database/dashboard/dashboard_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ import (

"github.com/DATA-DOG/go-sqlmock"
"github.com/sirupsen/logrus"
"gorm.io/driver/postgres"
"gorm.io/driver/sqlite"
"gorm.io/gorm"

"github.com/go-vela/server/database/testutils"
)

func TestDashboard_New(t *testing.T) {
Expand All @@ -29,7 +30,7 @@ func TestDashboard_New(t *testing.T) {

_config := &gorm.Config{SkipDefaultTransaction: true}

_postgres, err := gorm.Open(postgres.New(postgres.Config{Conn: _sql}), _config)
_postgres, err := testutils.TestPostgresGormInit(_sql)
if err != nil {
t.Errorf("unable to create new postgres database: %v", err)
}
Expand Down Expand Up @@ -122,10 +123,7 @@ func testPostgres(t *testing.T) (*Engine, sqlmock.Sqlmock) {
// create the new mock Postgres database client
//
// https://pkg.go.dev/gorm.io/gorm#Open
_postgres, err := gorm.Open(
postgres.New(postgres.Config{Conn: _sql}),
&gorm.Config{SkipDefaultTransaction: true},
)
_postgres, err := testutils.TestPostgresGormInit(_sql)
if err != nil {
t.Errorf("unable to create new postgres database: %v", err)
}
Expand Down
9 changes: 3 additions & 6 deletions database/deployment/deployment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (

"github.com/DATA-DOG/go-sqlmock"
"github.com/sirupsen/logrus"
"gorm.io/driver/postgres"
"gorm.io/driver/sqlite"
"gorm.io/gorm"

api "github.com/go-vela/server/api/types"
"github.com/go-vela/server/constants"
"github.com/go-vela/server/database/testutils"
"github.com/go-vela/server/database/types"
)

Expand All @@ -33,7 +33,7 @@ func TestDeployment_New(t *testing.T) {

_config := &gorm.Config{SkipDefaultTransaction: true}

_postgres, err := gorm.Open(postgres.New(postgres.Config{Conn: _sql}), _config)
_postgres, err := testutils.TestPostgresGormInit(_sql)
if err != nil {
t.Errorf("unable to create new postgres database: %v", err)
}
Expand Down Expand Up @@ -125,10 +125,7 @@ func testPostgres(t *testing.T) (*Engine, sqlmock.Sqlmock) {
// create the new mock Postgres database client
//
// https://pkg.go.dev/gorm.io/gorm#Open
_postgres, err := gorm.Open(
postgres.New(postgres.Config{Conn: _sql}),
&gorm.Config{SkipDefaultTransaction: true},
)
_postgres, err := testutils.TestPostgresGormInit(_sql)
if err != nil {
t.Errorf("unable to create new postgres database: %v", err)
}
Expand Down
9 changes: 3 additions & 6 deletions database/executable/executable_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (

"github.com/DATA-DOG/go-sqlmock"
"github.com/sirupsen/logrus"
"gorm.io/driver/postgres"
"gorm.io/driver/sqlite"
"gorm.io/gorm"

api "github.com/go-vela/server/api/types"
"github.com/go-vela/server/constants"
"github.com/go-vela/server/database/testutils"
)

func TestExecutable_New(t *testing.T) {
Expand All @@ -31,7 +31,7 @@ func TestExecutable_New(t *testing.T) {

_config := &gorm.Config{SkipDefaultTransaction: true}

_postgres, err := gorm.Open(postgres.New(postgres.Config{Conn: _sql}), _config)
_postgres, err := testutils.TestPostgresGormInit(_sql)
if err != nil {
t.Errorf("unable to create new postgres database: %v", err)
}
Expand Down Expand Up @@ -140,10 +140,7 @@ func testPostgres(t *testing.T) (*Engine, sqlmock.Sqlmock) {
// create the new mock Postgres database client
//
// https://pkg.go.dev/gorm.io/gorm#Open
_postgres, err := gorm.Open(
postgres.New(postgres.Config{Conn: _sql}),
&gorm.Config{SkipDefaultTransaction: true},
)
_postgres, err := testutils.TestPostgresGormInit(_sql)
if err != nil {
t.Errorf("unable to create new postgres database: %v", err)
}
Expand Down
9 changes: 3 additions & 6 deletions database/hook/hook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (

"github.com/DATA-DOG/go-sqlmock"
"github.com/sirupsen/logrus"
"gorm.io/driver/postgres"
"gorm.io/driver/sqlite"
"gorm.io/gorm"

api "github.com/go-vela/server/api/types"
"github.com/go-vela/server/constants"
"github.com/go-vela/server/database/testutils"
"github.com/go-vela/server/database/types"
)

Expand All @@ -33,7 +33,7 @@ func TestHook_New(t *testing.T) {

_config := &gorm.Config{SkipDefaultTransaction: true}

_postgres, err := gorm.Open(postgres.New(postgres.Config{Conn: _sql}), _config)
_postgres, err := testutils.TestPostgresGormInit(_sql)
if err != nil {
t.Errorf("unable to create new postgres database: %v", err)
}
Expand Down Expand Up @@ -125,10 +125,7 @@ func testPostgres(t *testing.T) (*Engine, sqlmock.Sqlmock) {
// create the new mock Postgres database client
//
// https://pkg.go.dev/gorm.io/gorm#Open
_postgres, err := gorm.Open(
postgres.New(postgres.Config{Conn: _sql}),
&gorm.Config{SkipDefaultTransaction: true},
)
_postgres, err := testutils.TestPostgresGormInit(_sql)
if err != nil {
t.Errorf("unable to create new postgres database: %v", err)
}
Expand Down
10 changes: 4 additions & 6 deletions database/jwk/jwk_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ import (

"github.com/DATA-DOG/go-sqlmock"
"github.com/sirupsen/logrus"
"gorm.io/driver/postgres"
"gorm.io/driver/sqlite"
"gorm.io/gorm"

"github.com/go-vela/server/database/testutils"
)

func TestJWK_New(t *testing.T) {
Expand All @@ -27,7 +28,7 @@ func TestJWK_New(t *testing.T) {

_config := &gorm.Config{SkipDefaultTransaction: true}

_postgres, err := gorm.Open(postgres.New(postgres.Config{Conn: _sql}), _config)
_postgres, err := testutils.TestPostgresGormInit(_sql)
if err != nil {
t.Errorf("unable to create new postgres database: %v", err)
}
Expand Down Expand Up @@ -120,10 +121,7 @@ func testPostgres(t *testing.T) (*Engine, sqlmock.Sqlmock) {
// create the new mock Postgres database client
//
// https://pkg.go.dev/gorm.io/gorm#Open
_postgres, err := gorm.Open(
postgres.New(postgres.Config{Conn: _sql}),
&gorm.Config{SkipDefaultTransaction: true},
)
_postgres, err := testutils.TestPostgresGormInit(_sql)
if err != nil {
t.Errorf("unable to create new postgres database: %v", err)
}
Expand Down
10 changes: 4 additions & 6 deletions database/log/log_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ import (

"github.com/DATA-DOG/go-sqlmock"
"github.com/sirupsen/logrus"
"gorm.io/driver/postgres"
"gorm.io/driver/sqlite"
"gorm.io/gorm"

"github.com/go-vela/server/database/testutils"
)

func TestLog_New(t *testing.T) {
Expand All @@ -32,7 +33,7 @@ func TestLog_New(t *testing.T) {

_config := &gorm.Config{SkipDefaultTransaction: true}

_postgres, err := gorm.Open(postgres.New(postgres.Config{Conn: _sql}), _config)
_postgres, err := testutils.TestPostgresGormInit(_sql)
if err != nil {
t.Errorf("unable to create new postgres database: %v", err)
}
Expand Down Expand Up @@ -127,10 +128,7 @@ func testPostgres(t *testing.T) (*Engine, sqlmock.Sqlmock) {
// create the new mock Postgres database client
//
// https://pkg.go.dev/gorm.io/gorm#Open
_postgres, err := gorm.Open(
postgres.New(postgres.Config{Conn: _sql}),
&gorm.Config{SkipDefaultTransaction: true},
)
_postgres, err := testutils.TestPostgresGormInit(_sql)
if err != nil {
t.Errorf("unable to create new postgres database: %v", err)
}
Expand Down
9 changes: 3 additions & 6 deletions database/pipeline/pipeline_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ import (

"github.com/DATA-DOG/go-sqlmock"
"github.com/sirupsen/logrus"
"gorm.io/driver/postgres"
"gorm.io/driver/sqlite"
"gorm.io/gorm"

api "github.com/go-vela/server/api/types"
"github.com/go-vela/server/constants"
"github.com/go-vela/server/database/testutils"
"github.com/go-vela/server/database/types"
)

Expand All @@ -34,7 +34,7 @@ func TestPipeline_New(t *testing.T) {

_config := &gorm.Config{SkipDefaultTransaction: true}

_postgres, err := gorm.Open(postgres.New(postgres.Config{Conn: _sql}), _config)
_postgres, err := testutils.TestPostgresGormInit(_sql)
if err != nil {
t.Errorf("unable to create new postgres database: %v", err)
}
Expand Down Expand Up @@ -132,10 +132,7 @@ func testPostgres(t *testing.T) (*Engine, sqlmock.Sqlmock) {
// create the new mock Postgres database client
//
// https://pkg.go.dev/gorm.io/gorm#Open
_postgres, err := gorm.Open(
postgres.New(postgres.Config{Conn: _sql}),
&gorm.Config{SkipDefaultTransaction: true},
)
_postgres, err := testutils.TestPostgresGormInit(_sql)
if err != nil {
t.Errorf("unable to create new postgres database: %v", err)
}
Expand Down
10 changes: 4 additions & 6 deletions database/repo/repo_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ import (

"github.com/DATA-DOG/go-sqlmock"
"github.com/sirupsen/logrus"
"gorm.io/driver/postgres"
"gorm.io/driver/sqlite"
"gorm.io/gorm"

"github.com/go-vela/server/database/testutils"
)

func TestRepo_New(t *testing.T) {
Expand All @@ -29,7 +30,7 @@ func TestRepo_New(t *testing.T) {

_config := &gorm.Config{SkipDefaultTransaction: true}

_postgres, err := gorm.Open(postgres.New(postgres.Config{Conn: _sql}), _config)
_postgres, err := testutils.TestPostgresGormInit(_sql)
if err != nil {
t.Errorf("unable to create new postgres database: %v", err)
}
Expand Down Expand Up @@ -124,10 +125,7 @@ func testPostgres(t *testing.T) (*Engine, sqlmock.Sqlmock) {
// create the new mock Postgres database client
//
// https://pkg.go.dev/gorm.io/gorm#Open
_postgres, err := gorm.Open(
postgres.New(postgres.Config{Conn: _sql}),
&gorm.Config{SkipDefaultTransaction: true},
)
_postgres, err := testutils.TestPostgresGormInit(_sql)
if err != nil {
t.Errorf("unable to create new postgres database: %v", err)
}
Expand Down
10 changes: 4 additions & 6 deletions database/schedule/schedule_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ import (

"github.com/DATA-DOG/go-sqlmock"
"github.com/sirupsen/logrus"
"gorm.io/driver/postgres"
"gorm.io/driver/sqlite"
"gorm.io/gorm"

"github.com/go-vela/server/database/testutils"
)

func TestSchedule_New(t *testing.T) {
Expand All @@ -31,7 +32,7 @@ func TestSchedule_New(t *testing.T) {

_config := &gorm.Config{SkipDefaultTransaction: true}

_postgres, err := gorm.Open(postgres.New(postgres.Config{Conn: _sql}), _config)
_postgres, err := testutils.TestPostgresGormInit(_sql)
if err != nil {
t.Errorf("unable to create new postgres database: %v", err)
}
Expand Down Expand Up @@ -126,10 +127,7 @@ func testPostgres(t *testing.T) (*Engine, sqlmock.Sqlmock) {
// create the new mock Postgres database client
//
// https://pkg.go.dev/gorm.io/gorm#Open
_postgres, err := gorm.Open(
postgres.New(postgres.Config{Conn: _sql}),
&gorm.Config{SkipDefaultTransaction: true},
)
_postgres, err := testutils.TestPostgresGormInit(_sql)
if err != nil {
t.Errorf("unable to create new postgres database: %v", err)
}
Expand Down
10 changes: 4 additions & 6 deletions database/secret/secret_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ import (

"github.com/DATA-DOG/go-sqlmock"
"github.com/sirupsen/logrus"
"gorm.io/driver/postgres"
"gorm.io/driver/sqlite"
"gorm.io/gorm"

"github.com/go-vela/server/database/testutils"
)

func TestSecret_New(t *testing.T) {
Expand All @@ -32,7 +33,7 @@ func TestSecret_New(t *testing.T) {

_config := &gorm.Config{SkipDefaultTransaction: true}

_postgres, err := gorm.Open(postgres.New(postgres.Config{Conn: _sql}), _config)
_postgres, err := testutils.TestPostgresGormInit(_sql)
if err != nil {
t.Errorf("unable to create new postgres database: %v", err)
}
Expand Down Expand Up @@ -131,10 +132,7 @@ func testPostgres(t *testing.T) (*Engine, sqlmock.Sqlmock) {
// create the new mock Postgres database client
//
// https://pkg.go.dev/gorm.io/gorm#Open
_postgres, err := gorm.Open(
postgres.New(postgres.Config{Conn: _sql}),
&gorm.Config{SkipDefaultTransaction: true},
)
_postgres, err := testutils.TestPostgresGormInit(_sql)
if err != nil {
t.Errorf("unable to create new postgres database: %v", err)
}
Expand Down
Loading
Loading