Merge pull request supabase#13961 from supabase/hi/use-new-project-pgbouncer-api-route

feat: use new project pgbouncer config api

Author: joshenlim

studio/components/interfaces/Settings/Database/ConnectionPooling.tsx

@@ -68,10 +68,8 @@ const ConnectionPooling: FC<Props> = () => {
     )
   }
 
-  const { project } = poolingConfiguration
-
   // for older projects
-  if (!project.pgbouncer_enabled && project.pool_mode == null)
+  if (!poolingConfiguration.pgbouncer_enabled && poolingConfiguration.pool_mode == null)
     return (
       <Panel
         title={
@@ -85,7 +83,7 @@ const ConnectionPooling: FC<Props> = () => {
         </Panel.Content>
       </Panel>
     )
-  const formModel = project
+  const formModel = poolingConfiguration
   const DB_FIELDS = ['db_host', 'db_name', 'db_port', 'db_user', 'inserted_at']
   const connectionInfo = pluckObjectFields(formModel, DB_FIELDS)
   const BOUNCER_FIELDS = [
@@ -137,15 +135,22 @@ export const PgbouncerConfig: FC<ConfigProps> = observer(
       pool_mode: bouncerInfo.pool_mode || 'transaction',
       default_pool_size: bouncerInfo.default_pool_size || '',
       ignore_startup_parameters: bouncerInfo.ignore_startup_parameters || '',
+      pgbouncer_enabled: bouncerInfo.pgbouncer_enabled,
     })
 
     const updateConfig = async (updatedConfig: any) => {
       try {
-        const response = await patch(`${API_URL}/props/pooling/${projectRef}/config`, updatedConfig)
+        const response = await patch(`${API_URL}/projects/${projectRef}/config/pgbouncer`, {
+          pgbouncer_enabled: updatedConfig.pgbouncer_enabled,
+          default_pool_size: updatedConfig.default_pool_size,
+          ignore_startup_parameters: updatedConfig.ignore_startup_parameters,
+          pool_mode: updatedConfig.pool_mode,
+          max_client_conn: updatedConfig.max_client_conn,
+        })
         if (response.error) {
           throw response.error
         } else {
-          setUpdates({ ...response.project })
+          setUpdates({ ...response })
           ui.setNotification({ category: 'success', message: 'Successfully saved settings' })
         }
       } catch (error: any) {

studio/stores/app/DatabaseStore.ts

@@ -24,7 +24,7 @@ export default class DatabaseStore extends PostgresMetaInterface<any> {
   async getPoolingConfiguration(projectRef: string) {
     try {
       // Need to use project ref -> shouldn;t need to pass it in via argument
-      const url = `${API_URL}/props/pooling/${projectRef}/config`
+      const url = `${API_URL}/projects/${projectRef}/config/pgbouncer`
       const response = await get(url, { headers: this.headers })
       if (response.error) throw response.error
       return response