Skip to content

fix(test): convert the pg suites missed by the shared container change #1958

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
AmanGIT07 merged 1 commit into from
Sep 29, 2026
Merged

fix(test): convert the pg suites missed by the shared container change #1958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 2 additions & 8 deletions internal/store/postgres/org_invoices_repository_pg_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@ package postgres_test
import (
"context"
"fmt"
"io"
"log/slog"
"testing"

"github.com/ory/dockertest"
"github.com/raystack/frontier/internal/store/postgres"
"github.com/raystack/frontier/pkg/db"
"github.com/raystack/salt/rql"
Expand All @@ -20,15 +17,12 @@ type OrgInvoicesRepositoryPGTestSuite struct {
suite.Suite
ctx context.Context
client *db.Client
pool *dockertest.Pool
resource *dockertest.Resource
repository *postgres.OrgInvoicesRepository
}

func (s *OrgInvoicesRepositoryPGTestSuite) 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 @@ -37,7 +31,7 @@ func (s *OrgInvoicesRepositoryPGTestSuite) SetupSuite() {
}

func (s *OrgInvoicesRepositoryPGTestSuite) TearDownSuite() {
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/org_serviceuser_credentials_repository_pg_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@ package postgres_test
import (
"context"
"fmt"
"io"
"log/slog"
"testing"

"github.com/ory/dockertest"
"github.com/raystack/frontier/internal/store/postgres"
"github.com/raystack/frontier/pkg/db"
"github.com/raystack/salt/rql"
Expand All @@ -20,15 +17,12 @@ type OrgServiceUserCredentialsRepositoryPGTestSuite struct {
suite.Suite
ctx context.Context
client *db.Client
pool *dockertest.Pool
resource *dockertest.Resource
repository *postgres.OrgServiceUserCredentialsRepository
}

func (s *OrgServiceUserCredentialsRepositoryPGTestSuite) 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 @@ -37,7 +31,7 @@ func (s *OrgServiceUserCredentialsRepositoryPGTestSuite) SetupSuite() {
}

func (s *OrgServiceUserCredentialsRepositoryPGTestSuite) TearDownSuite() {
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/project_users_repository_pg_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@ package postgres_test
import (
"context"
"fmt"
"io"
"log/slog"
"testing"

"github.com/ory/dockertest"
"github.com/raystack/frontier/core/aggregates/projectusers"
"github.com/raystack/frontier/internal/store/postgres"
"github.com/raystack/frontier/pkg/db"
Expand All @@ -21,16 +18,13 @@ type ProjectUsersRepositoryPGTestSuite struct {
suite.Suite
ctx context.Context
client *db.Client
pool *dockertest.Pool
resource *dockertest.Resource
repository *postgres.ProjectUsersRepository
orgID string
}

func (s *ProjectUsersRepositoryPGTestSuite) 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 @@ -39,7 +33,7 @@ func (s *ProjectUsersRepositoryPGTestSuite) SetupSuite() {
}

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

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

"github.com/ory/dockertest"
"github.com/raystack/frontier/billing/invoice"
"github.com/raystack/frontier/internal/store/postgres"
"github.com/raystack/frontier/pkg/db"
Expand All @@ -19,24 +16,21 @@ import (
// handlers answer with invalid argument instead of internal.
type SearchInvalidUUIDTestSuite struct {
suite.Suite
ctx context.Context
client *db.Client
pool *dockertest.Pool
resource *dockertest.Resource
ctx context.Context
client *db.Client
}

func (s *SearchInvalidUUIDTestSuite) 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)
}
s.ctx = context.TODO()
}

func (s *SearchInvalidUUIDTestSuite) TearDownSuite() {
if err := purgeDocker(s.pool, s.resource); err != nil {
if err := closeTestClient(s.client); err != nil {
s.T().Fatal(err)
}
}
Expand Down
14 changes: 4 additions & 10 deletions internal/store/postgres/search_live_org_pg_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@ package postgres_test
import (
"context"
"fmt"
"io"
"log/slog"
"testing"

"github.com/ory/dockertest"
"github.com/raystack/frontier/internal/store/postgres"
"github.com/raystack/frontier/pkg/db"
"github.com/raystack/salt/rql"
Expand All @@ -19,24 +16,21 @@ import (
// seeded with the same shape under a live organization and a deleted one.
type SearchLiveOrgTestSuite struct {
suite.Suite
ctx context.Context
client *db.Client
pool *dockertest.Pool
resource *dockertest.Resource
ctx context.Context
client *db.Client
}

func (s *SearchLiveOrgTestSuite) 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)
}
s.ctx = context.TODO()
}

func (s *SearchLiveOrgTestSuite) TearDownSuite() {
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/user_orgs_repository_pg_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@ package postgres_test
import (
"context"
"fmt"
"io"
"log/slog"
"testing"

"github.com/ory/dockertest"
"github.com/raystack/frontier/core/aggregates/userorgs"
"github.com/raystack/frontier/internal/store/postgres"
"github.com/raystack/frontier/pkg/db"
Expand All @@ -21,15 +18,12 @@ type UserOrgsRepositoryPGTestSuite struct {
suite.Suite
ctx context.Context
client *db.Client
pool *dockertest.Pool
resource *dockertest.Resource
repository *postgres.UserOrgsRepository
}

func (s *UserOrgsRepositoryPGTestSuite) 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 *UserOrgsRepositoryPGTestSuite) SetupSuite() {
}

func (s *UserOrgsRepositoryPGTestSuite) TearDownSuite() {
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/user_projects_repository_pg_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,9 @@ package postgres_test
import (
"context"
"fmt"
"io"
"log/slog"
"slices"
"testing"

"github.com/ory/dockertest"
"github.com/raystack/frontier/core/aggregates/userprojects"
"github.com/raystack/frontier/internal/store/postgres"
"github.com/raystack/frontier/pkg/db"
Expand All @@ -22,16 +19,13 @@ type UserProjectsRepositoryPGTestSuite struct {
suite.Suite
ctx context.Context
client *db.Client
pool *dockertest.Pool
resource *dockertest.Resource
repository *postgres.UserProjectsRepository
orgID string
}

func (s *UserProjectsRepositoryPGTestSuite) 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,7 +34,7 @@ func (s *UserProjectsRepositoryPGTestSuite) SetupSuite() {
}

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