cloud-pi-native · shikanime · Sep 1, 2026
@@ -107,6 +107,35 @@ describe('sonarqubeClientService', () => {
       )
       await service.createUser(user)
     })
+
+    it('should re-fetch the existing user on a create race instead of throwing', async () => {
+      const login = faker.internet.username()
+      const existing = makeSonarqubeUser({ login })
+      let createCalls = 0
+      server.use(
+        http.post(`${sonarUrl}/api/users/create`, () => {
+          createCalls += 1
+          return HttpResponse.json({ errors: [{ msg: `User '${login}' already exists` }] }, { status: 400 })
+        }),
+        http.get(`${sonarUrl}/api/users/search`, ({ request }) => {
+          expect(new URL(request.url).searchParams.get('q')).toBe(login)
+          return HttpResponse.json({ users: [existing], paging: { pageIndex: 1, pageSize: 10, total: 1 } })
+        }),
+      )
+
+      await expect(service.createUser({ email: `${login}@example.com`, local: 'true', login, name: login, password: faker.internet.password() })).resolves.toMatchObject({ login })
+
+      expect(createCalls).toBe(1)
+    })
+
+    it('should rethrow when the create fails for a non-collision reason', async () => {
+      const login = faker.internet.username()
+      server.use(
+        http.post(`${sonarUrl}/api/users/create`, () => HttpResponse.json({ errors: [{ msg: 'forbidden' }] }, { status: 403 })),
+      )
+
+      await expect(service.createUser({ email: `${login}@example.com`, local: 'true', login, name: login, password: faker.internet.password() })).rejects.toThrow()
+    })
   })
 
   describe('usersDeactivate', () => {

@@ -13,6 +13,7 @@ import { Inject, Injectable, Logger } from '@nestjs/common'
 import { StartActiveSpan } from '../infrastructure/telemetry/telemetry.decorator'
 import { SonarqubeHttpClientService } from './sonarqube-http-client.service'
 import { SONARQUBE_MAX_PAGES, SONARQUBE_PAGE_SIZE } from './sonarqube.constants'
+import { ensure } from './sonarqube.utils'
 
 export interface SonarqubePaging {
   pageIndex: number
@@ -288,8 +289,19 @@ export class SonarqubeClientService {
   }
 
   @StartActiveSpan()
-  async createUser(params: CreateUserParams) {
-    await this.http.fetch('users/create', { method: 'POST', query: params })
+  async createUser(params: CreateUserParams): Promise<SonarqubeUser | undefined> {
+    return ensure<SonarqubeUser | undefined>({
+      create: async () => {
+        await this.http.fetch('users/create', { method: 'POST', query: params })
+        return undefined
+      },
+      reload: async () => {
+        for await (const user of this.searchUsers({ q: params.login })) {
+          if (user.login === params.login) return user
+        }
+        return undefined
+      },
+    })
   }
 
   @StartActiveSpan()

@@ -0,0 +1,64 @@
+import { HttpStatus } from '@nestjs/common'
+import { describe, expect, it, vi } from 'vitest'
+import { SonarqubeError } from './sonarqube-http-client.service'
+import { ensure, isSonarqubeAlreadyExists, sonarProjectPropertiesFile } from './sonarqube.utils'
+
+describe('sonarProjectPropertiesFile', () => {
+  it('targets the project key with a quality-gate wait', () => {
+    expect(sonarProjectPropertiesFile('my-key')).toEqual([
+      'sonar.projectKey=my-key',
+      'sonar.qualitygate.wait=true',
+    ])
+  })
+})
+
+describe('isSonarqubeAlreadyExists', () => {
+  it('matches a 409 or an already/exists message', () => {
+    expect(isSonarqubeAlreadyExists(new SonarqubeError('ClientError', 'conflict', { status: HttpStatus.CONFLICT }))).toBe(true)
+    expect(isSonarqubeAlreadyExists(new SonarqubeError('ClientError', `User 'bob' already exists`, { status: 400 }))).toBe(true)
+  })
+
+  it('rejects other errors', () => {
+    expect(isSonarqubeAlreadyExists(new SonarqubeError('ClientError', 'forbidden', { status: 403 }))).toBe(false)
+    expect(isSonarqubeAlreadyExists(new Error('already exists'))).toBe(false)
+    expect(isSonarqubeAlreadyExists(null)).toBe(false)
+  })
+})
+
+describe('ensure', () => {
+  it('returns the created value when create succeeds', async () => {
+    const reload = vi.fn()
+
+    await expect(ensure({ create: async () => 'created', reload })).resolves.toBe('created')
+
+    expect(reload).not.toHaveBeenCalled()
+  })
+
+  it('reloads once on a collision and never retries create', async () => {
+    const error = new SonarqubeError('ClientError', 'already exists', { status: 409 })
+    const create = vi.fn(async () => { throw error })
+    const onCollision = vi.fn()
+    const reload = vi.fn(async () => 'existing')
+
+    await expect(ensure({ create, reload, onCollision })).resolves.toBe('existing')
+
+    expect(create).toHaveBeenCalledOnce()
+    expect(onCollision).toHaveBeenCalledWith(error)
+    expect(reload).toHaveBeenCalledOnce()
+  })
+
+  it('rethrows the original error when a collision finds nothing on reload', async () => {
+    const error = new SonarqubeError('ClientError', 'already exists', { status: 409 })
+
+    await expect(ensure({ create: async () => { throw error }, reload: async () => undefined })).rejects.toBe(error)
+  })
+
+  it('rethrows non-collision errors without reloading', async () => {
+    const error = new SonarqubeError('ClientError', 'forbidden', { status: 403 })
+    const reload = vi.fn()
+
+    await expect(ensure({ create: async () => { throw error }, reload })).rejects.toBe(error)
+
+    expect(reload).not.toHaveBeenCalled()
+  })
+})
@@ -1,6 +1,44 @@
+import { HttpStatus } from '@nestjs/common'
+import { SonarqubeError } from './sonarqube-http-client.service'
+
 export function sonarProjectPropertiesFile(projectKey: string) {
   return [
     `sonar.projectKey=${projectKey}`,
     'sonar.qualitygate.wait=true',
   ]
 }
+
+// Whether a SonarQube error signals an entity already existing (race
+// collision): a 409, or a 4xx whose message mentions "already"/"exists"
+// (SonarQube reports some collisions as a generic Bad Request).
+export function isSonarqubeAlreadyExists(error: unknown): error is SonarqubeError {
+  if (!(error instanceof SonarqubeError)) return false
+  if (error.status === HttpStatus.CONFLICT) return true
+  return error.status !== undefined && error.status >= 400 && error.status < 500 && /already|exists/i.test(error.message)
+}
+
+// Runs an idempotent write: tries `create`, and on a SonarQube race collision
+// reloads via `reload` and returns the existing entity instead of failing.
+// `onCollision` is invoked once when a collision is detected. If the reload
+// finds nothing, the original error is rethrown so genuine failures are not
+// swallowed.
+export async function ensure<T>({
+  create,
+  reload,
+  onCollision,
+}: {
+  create: () => Promise<T>
+  reload: () => Promise<T | undefined>
+  onCollision?: (error: unknown) => void
+}): Promise<T> {
+  try {
+    return await create()
+  } catch (error) {
+    if (isSonarqubeAlreadyExists(error)) {
+      onCollision?.(error)
+      const existing = await reload()
+      if (existing) return existing
+    }
+    throw error
+  }
+}