Skip to content
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

Jump to bottom

fix(server): use tenant_id for sequence creation #3519

Merged
merged 3 commits into from
Jan 11, 2024
Merged

fix(server): use tenant_id for sequence creation #3519

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55a1c89
fix(server): use tenant_id for secuence creation
schoren Jan 11, 2024
b63ac6d
fix
schoren Jan 11, 2024
3ceca94
add migration
mathnogueira Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions server/pkg/sqlutil/tenant.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,15 @@ func TenantInsert(ctx context.Context, params ...any) []any {
return append(params, *tenantID)
}

func TenantIDString(ctx context.Context) string {
tenantID := TenantID(ctx)
if tenantID == nil {
return ""
}

return *tenantID
}

func TenantID(ctx context.Context) *string {
tenantID := ctx.Value(middleware.TenantIDKey)

Expand Down
6 changes: 4 additions & 2 deletions server/test/run_repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,9 @@ func (r *runRepository) CreateRun(ctx context.Context, test Test, run Run) (Run,
return Run{}, fmt.Errorf("sql beginTx: %w", err)
}

_, err = tx.ExecContext(ctx, replaceRunSequenceName(createSequeceQuery, test.ID))
tenantID := sqlutil.TenantIDString(ctx)

_, err = tx.ExecContext(ctx, replaceRunSequenceName(createSequeceQuery, test.ID, tenantID))
if err != nil {
tx.Rollback()
return Run{}, fmt.Errorf("sql exec: %w", err)
Expand All @@ -196,7 +198,7 @@ func (r *runRepository) CreateRun(ctx context.Context, test Test, run Run) (Run,
)

var runID int
err = tx.QueryRowContext(ctx, replaceRunSequenceName(createRunQuery, test.ID), params...).Scan(&runID)
err = tx.QueryRowContext(ctx, replaceRunSequenceName(createRunQuery, test.ID, tenantID), params...).Scan(&runID)
if err != nil {
tx.Rollback()
return Run{}, fmt.Errorf("sql exec: %w", err)
Expand Down
10 changes: 5 additions & 5 deletions server/test/test_repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ func (r *repository) Delete(ctx context.Context, id id.ID) error {
}
}

dropSequence(ctx, tx, id)
dropSequence(ctx, tx, id, sqlutil.TenantIDString(ctx))

err = tx.Commit()
if err != nil {
Expand All @@ -533,10 +533,10 @@ const (
runSequenceName = "%sequence_name%"
)

func dropSequence(ctx context.Context, tx *sql.Tx, testID id.ID) error {
func dropSequence(ctx context.Context, tx *sql.Tx, testID id.ID, tenantID string) error {
_, err := tx.ExecContext(
ctx,
replaceRunSequenceName(dropSequenceQuery, testID),
replaceRunSequenceName(dropSequenceQuery, testID, tenantID),
)

return err
Expand All @@ -547,12 +547,12 @@ func md5Hash(text string) string {
return hex.EncodeToString(hash[:])
}

func replaceRunSequenceName(sql string, testID id.ID) string {
func replaceRunSequenceName(sql string, testID id.ID, tenantID string) string {
// postgres doesn't like uppercase chars in sequence names.
// testID might contain uppercase chars, and we cannot lowercase them
// because they might lose their uniqueness.
// md5 creates a unique, lowercase hash.
seqName := "runs_test_" + md5Hash(testID.String()) + "_seq"
seqName := "runs_test_" + md5Hash(testID.String()+tenantID) + "_seq"
return strings.ReplaceAll(sql, runSequenceName, seqName)
}

Expand Down
20 changes: 11 additions & 9 deletions server/testsuite/testsuite_run_repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,12 @@ func md5Hash(text string) string {
return hex.EncodeToString(hash[:])
}

func replaceTestSuiteRunSequenceName(sql string, ID id.ID) string {
func replaceTestSuiteRunSequenceName(sql string, ID id.ID, tenantID string) string {
// postgres doesn't like uppercase chars in sequence names.
// transactionID might contain uppercase chars, and we cannot lowercase them
// because they might lose their uniqueness.
// md5 creates a unique, lowercase hash.
seqName := "runs_test_suite_" + md5Hash(ID.String()) + "_seq"
seqName := "runs_test_suite_" + md5Hash(ID.String()+tenantID) + "_seq"
return strings.ReplaceAll(sql, runSequenceName, seqName)
}

Expand All @@ -118,12 +118,6 @@ func (td *RunRepository) CreateRun(ctx context.Context, tr TestSuiteRun) (TestSu
return TestSuiteRun{}, fmt.Errorf("sql beginTx: %w", err)
}

_, err = tx.ExecContext(ctx, replaceTestSuiteRunSequenceName(createSequenceQuery, tr.TestSuiteID))
if err != nil {
tx.Rollback()
return TestSuiteRun{}, fmt.Errorf("sql exec: %w", err)
}

params := sqlutil.TenantInsert(ctx,
tr.TestSuiteID,
tr.TestSuiteVersion,
Expand All @@ -134,10 +128,18 @@ func (td *RunRepository) CreateRun(ctx context.Context, tr TestSuiteRun) (TestSu
jsonVariableSet,
)

tenantID := sqlutil.TenantIDString(ctx)

_, err = tx.ExecContext(ctx, replaceTestSuiteRunSequenceName(createSequenceQuery, tr.TestSuiteID, tenantID))
if err != nil {
tx.Rollback()
return TestSuiteRun{}, fmt.Errorf("sql exec: %w", err)
}

var runID int
err = tx.QueryRowContext(
ctx,
replaceTestSuiteRunSequenceName(createTestSuiteRunQuery, tr.TestSuiteID),
replaceTestSuiteRunSequenceName(createTestSuiteRunQuery, tr.TestSuiteID, tenantID),
params...,
).Scan(&runID)
if err != nil {
Expand Down