fix(init): fix handling of gitlab repos

src/commands/database/db-status.ts

@@ -265,16 +265,16 @@ const renderPretty = (params: RenderParams) => {
     }
   } else {
     primary(STATUS_WARN, 'Netlify Database is not enabled for this project')
-    secondary(`Install the ${chalk.bold(NETLIFY_DATABASE_PACKAGE)} package and deploy your site to automatically`)
+    secondary(`Install the ${NETLIFY_DATABASE_PACKAGE} package and deploy your site to automatically`)
     secondary(`provision a database. Refer to ${DOCS_URL} for more information.`)
   }
   log('')
 
   if (packageInstalled) {
-    primary(STATUS_GOOD, `The ${chalk.bold(NETLIFY_DATABASE_PACKAGE)} package is installed`)
+    primary(STATUS_GOOD, `The ${NETLIFY_DATABASE_PACKAGE} package is installed`)
     secondary(`For a full API reference, visit ${DOCS_URL}`)
   } else {
-    primary(STATUS_WARN, `The ${chalk.bold(NETLIFY_DATABASE_PACKAGE)} package is not installed`)
+    primary(STATUS_WARN, `The ${NETLIFY_DATABASE_PACKAGE} package is not installed`)
     secondary(`Install it with \`npm install ${NETLIFY_DATABASE_PACKAGE}\``)
     secondary(`Refer to ${DOCS_URL} for more information`)
   }

src/utils/init/config-manual.ts

@@ -60,6 +60,9 @@ const addDeployHook = async (deployHook: string | undefined): Promise<boolean> =
   return deployHookAdded
 }
 
+const isSupportedProvider = (provider: string | null): provider is 'github' | 'gitlab' =>
+  provider === 'github' || provider === 'gitlab'
+
 export default async function configManual({
   command,
   repoData,
@@ -86,9 +89,9 @@ export default async function configManual({
   const deployKey = await createDeployKey({ api })
   await addDeployKey(deployKey)
 
-  const repoPath = await getRepoPath({ repoData })
+  const repoPath = repoData.repo ?? (await getRepoPath({ repoData }))
   const repo = {
-    provider: 'manual',
+    provider: isSupportedProvider(repoData.provider) ? repoData.provider : 'manual',
     repo_path: repoPath,
     repo_branch: repoData.branch,
     allowed_branches: [repoData.branch],

src/utils/telemetry/report-error.ts

@@ -59,8 +59,12 @@ export const reportError = async function (error, config = {}) {
 
   // spawn detached child process to handle send and wait for the http request to finish
   // otherwise it can get canceled
-  await execa(process.execPath, [join(dirPath, 'request.js'), options], {
-    detached: true,
-    stdio: 'ignore',
-  })
+  try {
+    await execa(process.execPath, [join(dirPath, 'request.js'), options], {
+      detached: true,
+      stdio: 'ignore',
+    })
+  } catch {
+    return
+  }
 }

tests/unit/commands/database/db-status.test.ts

@@ -1,6 +1,6 @@
 import { relative, sep } from 'path'
 
-import { describe, expect, test, vi, beforeEach, afterEach } from 'vitest'
+import { describe, expect, test, vi, beforeEach, afterEach, afterAll } from 'vitest'
 
 const {
   mockReaddir,
@@ -255,6 +255,10 @@ afterEach(() => {
   delete process.env.NETLIFY_DB_BRANCH
 })
 
+afterAll(() => {
+  vi.unstubAllGlobals()
+})
+
 describe('statusDb', () => {
   describe('enabled flag', () => {
     test('reports enabled=true when NETLIFY_DB_URL is set', async () => {

tests/unit/utils/get-repo-data.test.ts

@@ -0,0 +1,143 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import getRepoData from '../../../src/utils/get-repo-data.js'
+
+const mockGitConfig = vi.fn()
+const mockFindUp = vi.fn()
+const mockGitRepoInfo = vi.fn()
+
+vi.mock('gitconfiglocal', () => ({
+  default: (workingDir: string, cb: (err: Error | null, config: unknown) => void) => {
+    try {
+      cb(null, mockGitConfig(workingDir))
+    } catch (err) {
+      cb(err as Error, null)
+    }
+  },
+}))
+
+vi.mock('find-up', () => ({
+  findUp: (...args: unknown[]): unknown => mockFindUp(...args),
+}))
+
+vi.mock('git-repo-info', () => ({
+  default: (): unknown => mockGitRepoInfo(),
+}))
+
+vi.mock('../../../src/utils/command-helpers.js', () => ({
+  log: vi.fn(),
+}))
+
+describe('getRepoData', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockFindUp.mockResolvedValue('/test/.git')
+    mockGitRepoInfo.mockReturnValue({ branch: 'main' })
+  })
+
+  it('parses GitHub SSH URLs', async () => {
+    mockGitConfig.mockReturnValue({ remote: { origin: { url: 'git@github.com:ownername/test.git' } } })
+
+    const result = await getRepoData({ workingDir: '/test' })
+
+    expect(result).toEqual({
+      name: 'test',
+      owner: 'ownername',
+      repo: 'ownername/test',
+      url: 'git@github.com:ownername/test.git',
+      branch: 'main',
+      provider: 'github',
+      httpsUrl: 'https://github.com/ownername/test',
+    })
+  })
+
+  it('parses GitLab SSH URLs', async () => {
+    mockGitConfig.mockReturnValue({ remote: { origin: { url: 'git@gitlab.com:ownername/test.git' } } })
+
+    const result = await getRepoData({ workingDir: '/test' })
+
+    expect(result).toEqual({
+      name: 'test',
+      owner: 'ownername',
+      repo: 'ownername/test',
+      url: 'git@gitlab.com:ownername/test.git',
+      branch: 'main',
+      provider: 'gitlab',
+      httpsUrl: 'https://gitlab.com/ownername/test',
+    })
+  })
+
+  it('parses GitHub HTTPS URLs', async () => {
+    mockGitConfig.mockReturnValue({ remote: { origin: { url: 'https://github.com/ownername/test.git' } } })
+
+    const result = await getRepoData({ workingDir: '/test' })
+
+    expect(result).toMatchObject({
+      provider: 'github',
+      repo: 'ownername/test',
+      httpsUrl: 'https://github.com/ownername/test',
+    })
+  })
+
+  it('parses GitLab HTTPS URLs', async () => {
+    mockGitConfig.mockReturnValue({ remote: { origin: { url: 'https://gitlab.com/ownername/test.git' } } })
+
+    const result = await getRepoData({ workingDir: '/test' })
+
+    expect(result).toMatchObject({
+      provider: 'gitlab',
+      repo: 'ownername/test',
+      httpsUrl: 'https://gitlab.com/ownername/test',
+    })
+  })
+
+  it('uses host as provider for unknown Git hosts', async () => {
+    mockGitConfig.mockReturnValue({
+      remote: { origin: { url: 'git@custom-git.example.com:user/test.git' } },
+    })
+
+    const result = await getRepoData({ workingDir: '/test' })
+
+    expect(result).toMatchObject({
+      provider: 'custom-git.example.com',
+      repo: 'user/test',
+      httpsUrl: 'https://custom-git.example.com/user/test',
+    })
+  })
+
+  it('uses the specified remote name when provided', async () => {
+    mockGitConfig.mockReturnValue({
+      remote: {
+        origin: { url: 'git@github.com:owner/origin-repo.git' },
+        upstream: { url: 'git@gitlab.com:owner/upstream-repo.git' },
+      },
+    })
+
+    const result = await getRepoData({ workingDir: '/test', remoteName: 'upstream' })
+
+    expect(result).toMatchObject({
+      provider: 'gitlab',
+      repo: 'owner/upstream-repo',
+    })
+  })
+
+  it('returns an error when no Git remote is found', async () => {
+    mockFindUp.mockResolvedValue(undefined)
+    mockGitConfig.mockReturnValue({ remote: {} })
+
+    const result = await getRepoData({ workingDir: '/test' })
+
+    expect(result).toEqual({ error: 'No Git remote found' })
+  })
+
+  it('returns an error when the requested remote is not defined', async () => {
+    mockGitConfig.mockReturnValue({ remote: { origin: { url: 'git@github.com:owner/repo.git' } } })
+
+    const result = await getRepoData({ workingDir: '/test', remoteName: 'missing' })
+
+    expect(result).toEqual({
+      error:
+        'The specified remote "missing" is not defined in Git repo. Please use --git-remote-name flag to specify a remote.',
+    })
+  })
+})