Skip to content

test: share postgres container across suites #1934

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
rohilsurana merged 4 commits into from
Sep 29, 2026
Merged

test: share postgres container across suites #1934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d42a161
test: share postgres container across suites
RushikeshBhavsar3605 Sep 17, 2026
894a2c8
fix: close postgres test clients
RushikeshBhavsar3605 Sep 17, 2026
f1d2a5d
test: share postgres container across suites
RushikeshBhavsar3605 Sep 24, 2026
4b0b269
test: clean up remaining postgres test clients
RushikeshBhavsar3605 Sep 24, 2026
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
9 changes: 9 additions & 0 deletions cmd/migrate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ func RunMigrations(logger *slog.Logger, config db.Config) error {
if err != nil {
return err
}
defer func() {
Comment thread
RushikeshBhavsar3605 marked this conversation as resolved.
Resolved
_, _ = m.Close()
}()

if err = m.Up(); err != nil && err != migrate.ErrNoChange {
return err
}
Expand All @@ -33,6 +37,8 @@ func RunMigrations(logger *slog.Logger, config db.Config) error {
if err != nil {
return errors.Wrap(err, "failed to connect to db")
}
defer dbc.Close()

metaschemaRepository := postgres.NewMetaSchemaRepository(logger, dbc)
metaschemaService := metaschema.NewService(metaschemaRepository, logger, 0)
if err = metaschemaService.MigrateDefault(context.Background()); err != nil {
Expand All @@ -49,6 +55,9 @@ func RunRollback(logger *slog.Logger, config db.Config) error {
if err != nil {
return err
}
defer func() {
_, _ = m.Close()
}()

err = m.Steps(-1)
if err != nil && err != migrate.ErrNoChange {
Expand Down
11 changes: 2 additions & 9 deletions internal/store/postgres/audit_record_repository_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,7 @@ import (
"testing"
"time"

"io"
"log/slog"

"github.com/google/uuid"
"github.com/ory/dockertest"
"github.com/raystack/frontier/core/auditrecord"
"github.com/raystack/frontier/internal/store/postgres"
pkgAuditRecord "github.com/raystack/frontier/pkg/auditrecord"
Expand All @@ -34,17 +30,14 @@ type AuditRecordRepositoryTestSuite struct {
suite.Suite
ctx context.Context
client *db.Client
pool *dockertest.Pool
resource *dockertest.Resource
repository *postgres.AuditRecordRepository
auditRecords []auditrecord.AuditRecord
}

func (s *AuditRecordRepositoryTestSuite) SetupSuite() {
var err error

logger := slog.New(slog.NewTextHandler(io.Discard, nil))
s.client, s.pool, s.resource, err = newTestClient(logger)
s.client, err = newTestClient()
if err != nil {
s.T().Fatal(err)
}
Expand Down Expand Up @@ -100,7 +93,7 @@ func (s *AuditRecordRepositoryTestSuite) setupListTestData() {
}

func (s *AuditRecordRepositoryTestSuite) TearDownSuite() {
if err := purgeDocker(s.pool, s.resource); err != nil {
if err := closeTestClient(s.client); err != nil {
s.T().Fatal(err)
}
}
Expand Down
12 changes: 2 additions & 10 deletions internal/store/postgres/billing_customer_repository_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,9 @@ import (

"github.com/raystack/frontier/billing/customer"

"io"
"log/slog"

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/google/uuid"
"github.com/ory/dockertest"
"github.com/raystack/frontier/internal/store/postgres"
"github.com/raystack/frontier/pkg/db"
"github.com/raystack/frontier/pkg/metadata"
Expand All @@ -32,17 +28,14 @@ type BillingCustomerRepositoryTestSuite struct {
suite.Suite
ctx context.Context
client *db.Client
pool *dockertest.Pool
resource *dockertest.Resource
repository *postgres.BillingCustomerRepository
orgIDs []string
}

func (s *BillingCustomerRepositoryTestSuite) SetupSuite() {
var err error

logger := slog.New(slog.NewTextHandler(io.Discard, nil))
s.client, s.pool, s.resource, err = newTestClient(logger)
s.client, err = newTestClient()
if err != nil {
s.T().Fatal(err)
}
Expand All @@ -63,8 +56,7 @@ func (s *BillingCustomerRepositoryTestSuite) SetupTest() {
}

func (s *BillingCustomerRepositoryTestSuite) TearDownSuite() {
// Clean tests
if err := purgeDocker(s.pool, s.resource); err != nil {
if err := closeTestClient(s.client); err != nil {
s.T().Fatal(err)
}
}
Expand Down
12 changes: 2 additions & 10 deletions internal/store/postgres/billing_product_repository_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,8 @@ import (
"github.com/google/uuid"
"github.com/raystack/frontier/billing/product"

"io"
"log/slog"

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/ory/dockertest"
"github.com/raystack/frontier/internal/store/postgres"
"github.com/raystack/frontier/pkg/db"
"github.com/raystack/frontier/pkg/metadata"
Expand All @@ -25,16 +21,13 @@ type BillingProductRepositoryTestSuite struct {
suite.Suite
ctx context.Context
client *db.Client
pool *dockertest.Pool
resource *dockertest.Resource
repository *postgres.BillingProductRepository
}

func (s *BillingProductRepositoryTestSuite) SetupSuite() {
var err error

logger := slog.New(slog.NewTextHandler(io.Discard, nil))
s.client, s.pool, s.resource, err = newTestClient(logger)
s.client, err = newTestClient()
if err != nil {
s.T().Fatal(err)
}
Expand All @@ -47,8 +40,7 @@ func (s *BillingProductRepositoryTestSuite) SetupTest() {
}

func (s *BillingProductRepositoryTestSuite) TearDownSuite() {
// Clean tests
if err := purgeDocker(s.pool, s.resource); err != nil {
if err := closeTestClient(s.client); err != nil {
s.T().Fatal(err)
}
}
Expand Down
10 changes: 2 additions & 8 deletions internal/store/postgres/billing_transactions_repository_pg_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@ package postgres_test

import (
"context"
"io"
"log/slog"
"testing"

"github.com/google/uuid"
"github.com/ory/dockertest"
"github.com/raystack/frontier/billing/credit"
"github.com/raystack/frontier/internal/bootstrap/schema"
"github.com/raystack/frontier/internal/store/postgres"
Expand All @@ -19,16 +16,13 @@ type BillingTransactionRepositoryTestSuite struct {
suite.Suite
ctx context.Context
client *db.Client
pool *dockertest.Pool
resource *dockertest.Resource
repository *postgres.BillingTransactionRepository
}

func (s *BillingTransactionRepositoryTestSuite) SetupSuite() {
var err error

logger := slog.New(slog.NewTextHandler(io.Discard, nil))
s.client, s.pool, s.resource, err = newTestClient(logger)
s.client, err = newTestClient()
if err != nil {
s.T().Fatal(err)
}
Expand All @@ -38,7 +32,7 @@ func (s *BillingTransactionRepositoryTestSuite) SetupSuite() {
}

func (s *BillingTransactionRepositoryTestSuite) TearDownSuite() {
if err := purgeDocker(s.pool, s.resource); err != nil {
if err := closeTestClient(s.client); err != nil {
s.T().Fatal(err)
}
}
Expand Down
7 changes: 2 additions & 5 deletions internal/store/postgres/domain_repository_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"testing"

"github.com/google/uuid"
"github.com/ory/dockertest"
"github.com/raystack/frontier/core/domain"
"github.com/raystack/frontier/internal/store/postgres"
"github.com/raystack/frontier/pkg/db"
Expand All @@ -18,8 +17,6 @@ type DomainRepositoryTestSuite struct {
suite.Suite
ctx context.Context
client *db.Client
pool *dockertest.Pool
resource *dockertest.Resource
repository *postgres.DomainRepository
orgID string
}
Expand All @@ -28,7 +25,7 @@ func (s *DomainRepositoryTestSuite) SetupSuite() {
var err error

logger := slog.New(slog.NewTextHandler(io.Discard, nil))
s.client, s.pool, s.resource, err = newTestClient(logger)
s.client, err = newTestClient()
if err != nil {
s.T().Fatal(err)
}
Expand All @@ -44,7 +41,7 @@ func (s *DomainRepositoryTestSuite) SetupSuite() {
}

func (s *DomainRepositoryTestSuite) TearDownSuite() {
if err := purgeDocker(s.pool, s.resource); err != nil {
if err := closeTestClient(s.client); err != nil {
s.T().Fatal(err)
}
}
Expand Down
12 changes: 2 additions & 10 deletions internal/store/postgres/group_repository_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,9 @@ import (

"github.com/raystack/frontier/internal/bootstrap/schema"

"io"
"log/slog"

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/google/uuid"
"github.com/ory/dockertest"
"github.com/raystack/frontier/core/group"
"github.com/raystack/frontier/core/organization"
"github.com/raystack/frontier/core/relation"
Expand All @@ -29,8 +25,6 @@ type GroupRepositoryTestSuite struct {
suite.Suite
ctx context.Context
client *db.Client
pool *dockertest.Pool
resource *dockertest.Resource
repository *postgres.GroupRepository
relationRepository *postgres.RelationRepository
namespaceRepository *postgres.NamespaceRepository
Expand All @@ -43,8 +37,7 @@ type GroupRepositoryTestSuite struct {
func (s *GroupRepositoryTestSuite) SetupSuite() {
var err error

logger := slog.New(slog.NewTextHandler(io.Discard, nil))
s.client, s.pool, s.resource, err = newTestClient(logger)
s.client, err = newTestClient()
if err != nil {
s.T().Fatal(err)
}
Expand Down Expand Up @@ -125,8 +118,7 @@ func (s *GroupRepositoryTestSuite) SetupTest() {
}

func (s *GroupRepositoryTestSuite) TearDownSuite() {
// Clean tests
if err := purgeDocker(s.pool, s.resource); err != nil {
if err := closeTestClient(s.client); err != nil {
s.T().Fatal(err)
}
}
Expand Down
8 changes: 2 additions & 6 deletions internal/store/postgres/invitation_repository_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
"log/slog"

"github.com/google/uuid"
"github.com/ory/dockertest"
"github.com/raystack/frontier/core/group"
"github.com/raystack/frontier/core/invitation"
"github.com/raystack/frontier/core/user"
Expand All @@ -26,8 +25,6 @@ type InvitationRespositoryTestSuite struct {
suite.Suite
ctx context.Context
client *db.Client
pool *dockertest.Pool
resource *dockertest.Resource
repository *postgres.InvitationRepository
users []user.User
groups []group.Group
Expand All @@ -39,7 +36,7 @@ func (s *InvitationRespositoryTestSuite) SetupSuite() {
var err error

logger := slog.New(slog.NewTextHandler(io.Discard, nil))
s.client, s.pool, s.resource, err = newTestClient(logger)
s.client, err = newTestClient()
if err != nil {
s.T().Fatal(err)
}
Expand Down Expand Up @@ -69,8 +66,7 @@ func (s *InvitationRespositoryTestSuite) SetupTest() {
}

func (s *InvitationRespositoryTestSuite) TearDownSuite() {
// Clean tests
if err := purgeDocker(s.pool, s.resource); err != nil {
if err := closeTestClient(s.client); err != nil {
s.T().Fatal(err)
}
}
Expand Down
12 changes: 2 additions & 10 deletions internal/store/postgres/kyc_repository_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,9 @@ import (
"sort"
"testing"

"io"
"log/slog"

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/google/uuid"
"github.com/ory/dockertest"
"github.com/raystack/frontier/core/kyc"
"github.com/raystack/frontier/core/organization"
"github.com/raystack/frontier/internal/store/postgres"
Expand All @@ -24,8 +20,6 @@ type OrgKycRepositoryTestSuite struct {
suite.Suite
ctx context.Context
client *db.Client
pool *dockertest.Pool
resource *dockertest.Resource
repository *postgres.OrgKycRepository
orgRepository *postgres.OrganizationRepository
kycs []kyc.KYC
Expand All @@ -35,8 +29,7 @@ type OrgKycRepositoryTestSuite struct {
func (s *OrgKycRepositoryTestSuite) SetupSuite() {
var err error

logger := slog.New(slog.NewTextHandler(io.Discard, nil))
s.client, s.pool, s.resource, err = newTestClient(logger)
s.client, err = newTestClient()
if err != nil {
s.T().Fatal(err)
}
Expand All @@ -59,8 +52,7 @@ func (s *OrgKycRepositoryTestSuite) SetupTest() {
}

func (s *OrgKycRepositoryTestSuite) TearDownSuite() {
// Clean tests
if err := purgeDocker(s.pool, s.resource); err != nil {
if err := closeTestClient(s.client); err != nil {
s.T().Fatal(err)
}
}
Expand Down
16 changes: 4 additions & 12 deletions internal/store/postgres/lock_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,15 @@ import (
"context"
"testing"

"io"
"log/slog"

"github.com/ory/dockertest"
"github.com/stretchr/testify/suite"

"github.com/raystack/frontier/pkg/db"
)

type LockTestSuite struct {
suite.Suite
ctx context.Context
client *db.Client
pool *dockertest.Pool
resource *dockertest.Resource
ctx context.Context
client *db.Client
}

func TestLocks(t *testing.T) {
Expand All @@ -28,8 +22,7 @@ func TestLocks(t *testing.T) {
func (s *LockTestSuite) SetupSuite() {
var err error

logger := slog.New(slog.NewTextHandler(io.Discard, nil))
s.client, s.pool, s.resource, err = newTestClient(logger)
s.client, err = newTestClient()
if err != nil {
s.T().Fatal(err)
}
Expand All @@ -40,8 +33,7 @@ func (s *LockTestSuite) SetupSuite() {
func (s *LockTestSuite) SetupTest() {}

func (s *LockTestSuite) TearDownSuite() {
// Clean tests
if err := purgeDocker(s.pool, s.resource); err != nil {
if err := closeTestClient(s.client); err != nil {
s.T().Fatal(err)
}
}
Expand Down
Loading
Loading