diff --git a/database/build/build_test.go b/database/build/build_test.go index daec5a3d5..b9f4c81f6 100644 --- a/database/build/build_test.go +++ b/database/build/build_test.go @@ -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) { @@ -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) } @@ -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) } diff --git a/database/dashboard/dashboard_test.go b/database/dashboard/dashboard_test.go index 0434f3f16..86ef385d1 100644 --- a/database/dashboard/dashboard_test.go +++ b/database/dashboard/dashboard_test.go @@ -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) { @@ -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) } @@ -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) } diff --git a/database/deployment/deployment_test.go b/database/deployment/deployment_test.go index a4e028a7b..02310d6bb 100644 --- a/database/deployment/deployment_test.go +++ b/database/deployment/deployment_test.go @@ -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" ) @@ -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) } @@ -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) } diff --git a/database/executable/executable_test.go b/database/executable/executable_test.go index fe274b7d0..2338efe99 100644 --- a/database/executable/executable_test.go +++ b/database/executable/executable_test.go @@ -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) { @@ -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) } @@ -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) } diff --git a/database/hook/hook_test.go b/database/hook/hook_test.go index 29b2fb060..9b7b681a2 100644 --- a/database/hook/hook_test.go +++ b/database/hook/hook_test.go @@ -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" ) @@ -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) } @@ -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) } diff --git a/database/jwk/jwk_test.go b/database/jwk/jwk_test.go index 6d42cd64c..d0b562d9a 100644 --- a/database/jwk/jwk_test.go +++ b/database/jwk/jwk_test.go @@ -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) { @@ -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) } @@ -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) } diff --git a/database/log/log_test.go b/database/log/log_test.go index f556d12e8..d4fb214b2 100644 --- a/database/log/log_test.go +++ b/database/log/log_test.go @@ -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) { @@ -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) } @@ -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) } diff --git a/database/pipeline/pipeline_test.go b/database/pipeline/pipeline_test.go index 00ef06a99..2f3cf6b4e 100644 --- a/database/pipeline/pipeline_test.go +++ b/database/pipeline/pipeline_test.go @@ -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" ) @@ -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) } @@ -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) } diff --git a/database/repo/repo_test.go b/database/repo/repo_test.go index dd98a0d04..144dd8f0f 100644 --- a/database/repo/repo_test.go +++ b/database/repo/repo_test.go @@ -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) { @@ -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) } @@ -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) } diff --git a/database/schedule/schedule_test.go b/database/schedule/schedule_test.go index af1df11d3..fcbbc9388 100644 --- a/database/schedule/schedule_test.go +++ b/database/schedule/schedule_test.go @@ -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) { @@ -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) } @@ -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) } diff --git a/database/secret/secret_test.go b/database/secret/secret_test.go index b33c411e1..0dd7bdef9 100644 --- a/database/secret/secret_test.go +++ b/database/secret/secret_test.go @@ -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) { @@ -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) } @@ -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) } diff --git a/database/service/service_test.go b/database/service/service_test.go index a3d696871..335bb6d3f 100644 --- a/database/service/service_test.go +++ b/database/service/service_test.go @@ -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 TestService_New(t *testing.T) { @@ -29,7 +30,7 @@ func TestService_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) } @@ -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) } diff --git a/database/settings/settings_test.go b/database/settings/settings_test.go index 7c1cb474d..1ab0435c2 100644 --- a/database/settings/settings_test.go +++ b/database/settings/settings_test.go @@ -8,11 +8,11 @@ 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/api/types/settings" + "github.com/go-vela/server/database/testutils" ) func TestSettings_New(t *testing.T) { @@ -29,7 +29,7 @@ func TestSettings_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) } @@ -120,10 +120,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) } diff --git a/database/step/step_test.go b/database/step/step_test.go index a68a4b8ce..e3ea1b81c 100644 --- a/database/step/step_test.go +++ b/database/step/step_test.go @@ -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 TestStep_New(t *testing.T) { @@ -29,7 +30,7 @@ func TestStep_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) } @@ -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) } diff --git a/database/testutils/postgres_init.go b/database/testutils/postgres_init.go new file mode 100644 index 000000000..8f749c3ad --- /dev/null +++ b/database/testutils/postgres_init.go @@ -0,0 +1,25 @@ +// SPDX-License-Identifier: Apache-2.0 + +package testutils + +import ( + "database/sql" + + "gorm.io/driver/postgres" + "gorm.io/gorm" +) + +// testPostgresGormInit initializes a Gorm DB for postgres testing. +// +// TODO: remove this when Gorm updates a bug they introduced in 1.30.1 where the +// special dialector config is overwritten in the Open(..) function. +func TestPostgresGormInit(sql *sql.DB) (*gorm.DB, error) { + _postgres, err := gorm.Open(postgres.New(postgres.Config{Conn: sql})) + if err != nil { + return nil, err + } + + _postgres = _postgres.Session(&gorm.Session{SkipDefaultTransaction: true}) + + return _postgres, nil +} diff --git a/database/user/user_test.go b/database/user/user_test.go index deded8357..d7a076d57 100644 --- a/database/user/user_test.go +++ b/database/user/user_test.go @@ -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 TestUser_New(t *testing.T) { @@ -29,7 +30,7 @@ func TestUser_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) } @@ -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) } diff --git a/database/worker/worker_test.go b/database/worker/worker_test.go index dceb9db7e..52805c0a2 100644 --- a/database/worker/worker_test.go +++ b/database/worker/worker_test.go @@ -8,11 +8,11 @@ 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/database/testutils" ) func TestWorker_New(t *testing.T) { @@ -30,7 +30,7 @@ func TestWorker_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) } @@ -164,10 +164,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) } diff --git a/go.mod b/go.mod index 7459b260c..6cf1784b2 100644 --- a/go.mod +++ b/go.mod @@ -53,7 +53,7 @@ require ( golang.org/x/time v0.12.0 gorm.io/driver/postgres v1.6.0 gorm.io/driver/sqlite v1.6.0 - gorm.io/gorm v1.30.0 + gorm.io/gorm v1.30.1 k8s.io/apimachinery v0.33.3 ) diff --git a/go.sum b/go.sum index d09009de0..15c6ab5b3 100644 --- a/go.sum +++ b/go.sum @@ -398,8 +398,8 @@ gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4= gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo= gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ= gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8= -gorm.io/gorm v1.30.0 h1:qbT5aPv1UH8gI99OsRlvDToLxW5zR7FzS9acZDOZcgs= -gorm.io/gorm v1.30.0/go.mod h1:8Z33v652h4//uMA76KjeDH8mJXPm1QNCYrMeatR0DOE= +gorm.io/gorm v1.30.1 h1:lSHg33jJTBxs2mgJRfRZeLDG+WZaHYCk3Wtfl6Ngzo4= +gorm.io/gorm v1.30.1/go.mod h1:8Z33v652h4//uMA76KjeDH8mJXPm1QNCYrMeatR0DOE= k8s.io/apimachinery v0.33.3 h1:4ZSrmNa0c/ZpZJhAgRdcsFcZOw1PQU1bALVQ0B3I5LA= k8s.io/apimachinery v0.33.3/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=