chore: remove ignore_startup_parameters from config

supabase · Aug 17, 2023 · a008154 · a008154
1 parent 95b05b1
commit a008154
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/internal/link/link.go b/internal/link/link.go
@@ -219,15 +219,13 @@ func linkPooler(ctx context.Context, projectRef string) error {
 func updatePoolerConfig(config api.ProjectPgBouncerConfig) {
 	copy := utils.Config.Db.Pooler
 	copy.PoolMode = utils.PoolMode(config.PoolMode)
-	copy.IgnoreStartupParameters = readCsv(config.IgnoreStartupParameters)
 	if config.DefaultPoolSize != nil {
 		copy.DefaultPoolSize = uint(*config.DefaultPoolSize)
 	}
 	if config.MaxClientConn != nil {
 		copy.MaxClientConn = uint(*config.MaxClientConn)
 	}
 	changed := utils.Config.Db.Pooler.PoolMode != copy.PoolMode ||
-		!utils.SliceEqual(utils.Config.Db.Pooler.IgnoreStartupParameters, copy.IgnoreStartupParameters) ||
 		utils.Config.Db.Pooler.DefaultPoolSize != copy.DefaultPoolSize ||
 		utils.Config.Db.Pooler.MaxClientConn != copy.MaxClientConn
 	if changed {

diff --git a/internal/start/start.go b/internal/start/start.go
@@ -767,9 +767,10 @@ EOF
 					fmt.Sprintf("POSTGRESQL_PORT=%d", dbConfig.Port),
 					"POSTGRESQL_PASSWORD=" + dbConfig.Password,
 					fmt.Sprintf("PGBOUNCER_POOL_MODE=%s", utils.Config.Db.Pooler.PoolMode),
-					fmt.Sprintf("PGBOUNCER_IGNORE_STARTUP_PARAMETERS=%s", strings.Join(utils.Config.Db.Pooler.IgnoreStartupParameters, ",")),
 					fmt.Sprintf("PGBOUNCER_DEFAULT_POOL_SIZE=%d", utils.Config.Db.Pooler.DefaultPoolSize),
 					fmt.Sprintf("PGBOUNCER_MAX_CLIENT_CONN=%d", utils.Config.Db.Pooler.MaxClientConn),
+					// Default platform config: https://github.com/supabase/postgres/blob/develop/ansible/files/pgbouncer_config/pgbouncer.ini.j2
+					"PGBOUNCER_IGNORE_STARTUP_PARAMETERS=extra_float_digits",
 				},
 				Healthcheck: &container.HealthConfig{
 					Test:     []string{"CMD", "bash", "-c", "printf \\0 > /dev/tcp/localhost/6432"},

diff --git a/internal/utils/config.go b/internal/utils/config.go
@@ -174,12 +174,11 @@ type (
 	}
 
 	pooler struct {
-		Enabled                 bool     `toml:"enabled"`
-		Port                    uint16   `toml:"port"`
-		PoolMode                PoolMode `toml:"pool_mode"`
-		DefaultPoolSize         uint     `toml:"default_pool_size"`
-		IgnoreStartupParameters []string `toml:"ignore_startup_parameters"`
-		MaxClientConn           uint     `toml:"max_client_conn"`
+		Enabled         bool     `toml:"enabled"`
+		Port            uint16   `toml:"port"`
+		PoolMode        PoolMode `toml:"pool_mode"`
+		DefaultPoolSize uint     `toml:"default_pool_size"`
+		MaxClientConn   uint     `toml:"max_client_conn"`
 	}
 
 	studio struct {

diff --git a/internal/utils/templates/init_config.test.toml b/internal/utils/templates/init_config.test.toml
@@ -28,7 +28,6 @@ enabled = true
 port = 54329
 pool_mode = "transaction"
 default_pool_size = 20
-ignore_startup_parameters = ["extra_float_digits"]
 max_client_conn = 100
 
 [studio]

diff --git a/internal/utils/templates/init_config.toml b/internal/utils/templates/init_config.toml
@@ -28,7 +28,6 @@ enabled = false
 port = 54329
 pool_mode = "transaction"
 default_pool_size = 20
-ignore_startup_parameters = ["extra_float_digits"]
 max_client_conn = 100
 
 [studio]