improve db init ux - dont throw error on CONFLICT (db already connected)

- if db already connected, we just say its connected and continue to log the status - improve status by fetching cli-db-status extension endpoint
netlify · khendrikse · Jun 5, 2025 · Mar 20, 2025 · Mar 20, 2025 · Mar 24, 2025
commit e151484c711d247b1e43d435ec9e7ebf73ce062d
@@ -118,27 +118,48 @@ export const init = async (_options: OptionValues, command: BaseCommand) => {
       code?: string
       message?: string
     }
-    throw new Error(`Failed to initialize DB: ${error.message ?? 'Unknown error occurred'}`)
+    if (error.code === 'CONFLICT') {
+      log(`Database already connected to this site. Skipping initialization.`)
+    } else {
+      throw new Error(`Failed to initialize DB: ${error.message ?? 'Unknown error occurred'}`)
+    }
   }
 
-  const res = (await req.json()) as {
-    code?: string
-    message?: string
-  }
+  let status
 
-  if (res.code !== 'DATABASE_INITIALIZED') {
-    throw new Error(`Failed to initialize DB: ${res.message ?? 'Unknown error'}`)
+  try {
+    const statusEndpoint = new URL('/api/cli-db-status', hostSiteUrl).toString()
+    const statusRes = await fetch(statusEndpoint, {
+      headers,
+    })
+    if (!statusRes.ok) {
+      throw new Error(`Failed to get database status`, { cause: statusRes })
+    }
+    status = (await statusRes.json()) as {
+      siteConfiguration?: {
+        connectedDatabase?: {
+          isConnected: boolean
+        }
+      }
+      existingManagedEnvs?: string[]
+    }
+  } catch (e) {
+    console.error('Failed to get database status', e)
   }
 
   log(
     prettyjson.render({
       'Current team': account.name,
       'Current site': siteInfo.name,
       [`${extension.name} extension`]: 'installed on team',
-      ['Database status']: 'connected to site',
+      ['Database status']: status?.siteConfiguration?.connectedDatabase?.isConnected
+        ? 'connected to site'
+        : 'not connected',
       ['Environment variables']: '',
-      ['  NETLIFY_DATABASE_URL']: 'saved',
-      ['  NETLIFY_DATABASE_URL_UNPOOLED']: 'saved',
+      ['  NETLIFY_DATABASE_URL']: status?.existingManagedEnvs?.includes('NETLIFY_DATABASE_URL') ? 'saved' : 'not set',
+      ['  NETLIFY_DATABASE_URL_UNPOOLED']: status?.existingManagedEnvs?.includes('NETLIFY_DATABASE_URL_UNPOOLED')
+        ? 'saved'
+        : 'not set',
     }),
   )
   return