Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion internal/db/reset/reset_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ func TestResetCommand(t *testing.T) {

t.Run("seeds storage after reset", func(t *testing.T) {
utils.DbId = "test-reset"
utils.ConfigId = "test-config"
utils.Config.Db.MajorVersion = 15
// Setup in-memory fs
fsys := afero.NewMemMapFs()
Expand Down
1 change: 0 additions & 1 deletion internal/db/start/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ func NewHostConfig() container.HostConfig {
RestartPolicy: container.RestartPolicy{Name: "always"},
Binds: []string{
utils.DbId + ":/var/lib/postgresql/data",
utils.ConfigId + ":/etc/postgresql-custom",
},
}
if utils.Config.Db.MajorVersion <= 14 {
Expand Down
3 changes: 0 additions & 3 deletions internal/db/start/start_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ func TestStartDatabase(t *testing.T) {
t.Run("initialize main branch", func(t *testing.T) {
utils.Config.Db.MajorVersion = 15
utils.DbId = "supabase_db_test"
utils.ConfigId = "supabase_config_test"
utils.Config.Db.Port = 5432
// Setup in-memory fs
fsys := afero.NewMemMapFs()
Expand Down Expand Up @@ -103,7 +102,6 @@ func TestStartDatabase(t *testing.T) {
t.Run("recover from backup volume", func(t *testing.T) {
utils.Config.Db.MajorVersion = 14
utils.DbId = "supabase_db_test"
utils.ConfigId = "supabase_config_test"
utils.Config.Db.Port = 5432
// Setup in-memory fs
fsys := afero.NewMemMapFs()
Expand Down Expand Up @@ -316,7 +314,6 @@ func TestStartDatabaseWithCustomSettings(t *testing.T) {
// Setup
utils.Config.Db.MajorVersion = 15
utils.DbId = "supabase_db_test"
utils.ConfigId = "supabase_config_test"
utils.Config.Db.Port = 5432
utils.Config.Db.Settings.MaxConnections = cast.Ptr(uint(50))

Expand Down
2 changes: 0 additions & 2 deletions internal/start/start_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ func TestDatabaseStart(t *testing.T) {
}
// Start postgres
utils.DbId = "test-postgres"
utils.ConfigId = "test-config"
utils.Config.Db.Port = 54322
utils.Config.Db.MajorVersion = 15
gock.New(utils.Docker.DaemonHost()).
Expand Down Expand Up @@ -230,7 +229,6 @@ func TestDatabaseStart(t *testing.T) {
JSON(image.InspectResponse{})
// Start postgres
utils.DbId = "test-postgres"
utils.ConfigId = "test-config"
utils.Config.Db.Port = 54322
utils.Config.Db.MajorVersion = 15
gock.New(utils.Docker.DaemonHost()).
Expand Down
2 changes: 0 additions & 2 deletions internal/stop/stop_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,6 @@ func TestStopServices(t *testing.T) {

t.Run("removes data volumes", func(t *testing.T) {
utils.DbId = "test-db"
utils.ConfigId = "test-config"
utils.StorageId = "test-storage"
utils.EdgeRuntimeId = "test-functions"
utils.InbucketId = "test-inbucket"
Expand All @@ -208,7 +207,6 @@ func TestStopServices(t *testing.T) {

t.Run("skips all filter when removing data volumes with Docker version pre-v1.42", func(t *testing.T) {
utils.DbId = "test-db"
utils.ConfigId = "test-config"
utils.StorageId = "test-storage"
utils.EdgeRuntimeId = "test-functions"
utils.InbucketId = "test-inbucket"
Expand Down
2 changes: 0 additions & 2 deletions internal/utils/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
var (
NetId string
DbId string
ConfigId string
KongId string
GotrueId string
InbucketId string
Expand Down Expand Up @@ -64,7 +63,6 @@ func UpdateDockerIds() {
NetId = GetId("network")
}
DbId = GetId(DbAliases[0])
ConfigId = GetId("config")
KongId = GetId(KongAliases[0])
GotrueId = GetId(GotrueAliases[0])
InbucketId = GetId(InbucketAliases[0])
Expand Down