👌 fix unit tests

Author: thomas-lebeau

scripts/deploy/deploy-prod-dc.spec.ts

@@ -1,13 +1,11 @@
 import assert from 'node:assert/strict'
 import path from 'node:path'
-import { beforeEach, before, describe, it, mock } from 'node:test'
+import { beforeEach, before, describe, it, mock, afterEach } from 'node:test'
 import type { CommandDetail } from './lib/testHelpers.ts'
-import { mockModule, mockCommandImplementation } from './lib/testHelpers.ts'
+import { mockCommandImplementation, mockModule } from './lib/testHelpers.ts'
 
-// eslint-disable-next-line
-describe.only('deploy-prod-dc', () => {
+describe('deploy-prod-dc', () => {
   const commandMock = mock.fn()
-
   let commands: CommandDetail[]
 
   before(async () => {
@@ -21,6 +19,10 @@ describe.only('deploy-prod-dc', () => {
     commands = mockCommandImplementation(commandMock)
   })
 
+  afterEach(() => {
+    mock.restoreAll()
+  })
+
   it('should deploy a given datacenter', async () => {
     await runScript('./deploy-prod-dc.ts', 'v6', 'us1')
 
@@ -42,22 +44,21 @@ describe.only('deploy-prod-dc', () => {
     ])
   })
 
-  it('should only check monitors before deploying if the upload path is root', async () => {
-    await runScript('./deploy-prod-dc.ts', 'v6', 'root', '--check-monitors')
+  it('should deploy all minor datacenters', async () => {
+    await runScript('./deploy-prod-dc.ts', 'v6', 'minor-dcs', '--no-check-monitors')
 
     assert.deepEqual(commands, [
-      { command: 'node ./scripts/deploy/check-monitors.ts root' },
-      { command: 'node ./scripts/deploy/deploy.ts prod v6 root' },
-      { command: 'node ./scripts/deploy/upload-source-maps.ts v6 root' },
+      { command: 'node ./scripts/deploy/deploy.ts prod v6 ap1,ap2,us3,us5' },
+      { command: 'node ./scripts/deploy/upload-source-maps.ts v6 ap1,ap2,us3,us5' },
     ])
   })
 
-  it('should deploy all minor datacenters', async () => {
-    await runScript('./deploy-prod-dc.ts', 'v6', 'minor-dcs', '--no-check-monitors')
+  it('should deploy all private regions', async () => {
+    await runScript('./deploy-prod-dc.ts', 'v6', 'private-regions', '--no-check-monitors')
 
     assert.deepEqual(commands, [
-      { command: 'node ./scripts/deploy/deploy.ts prod v6 us3,us5,ap1,ap2,prtest00' },
-      { command: 'node ./scripts/deploy/upload-source-maps.ts v6 us3,us5,ap1,ap2,prtest00' },
+      { command: 'node ./scripts/deploy/deploy.ts prod v6 prtest00,prtest01' },
+      { command: 'node ./scripts/deploy/upload-source-maps.ts v6 prtest00,prtest01' },
     ])
   })
 })

scripts/deploy/lib/testHelpers.ts

@@ -62,9 +62,7 @@ export function mockCommandImplementation(mockFn: Mock<(...args: any[]) => void>
       withCurrentWorkingDirectory: () => result,
       withLogs: () => result,
       run(): string | undefined {
-        commands.push(commandDetail)
-
-        if (command.includes('aws sts assume-role')) {
+        if (command.startsWith('aws sts assume-role')) {
           return JSON.stringify({
             Credentials: {
               AccessKeyId: FAKE_AWS_ENV_CREDENTIALS.AWS_ACCESS_KEY_ID,
@@ -73,6 +71,22 @@ export function mockCommandImplementation(mockFn: Mock<(...args: any[]) => void>
             },
           })
         }
+
+        if (command.startsWith('ddtool datacenters list')) {
+          return JSON.stringify([
+            { name: 'ap1.prod.dog', site: 'ap1.datadoghq.com' },
+            { name: 'ap2.prod.dog', site: 'ap2.datadoghq.com' },
+            { name: 'eu1.prod.dog', site: 'datadoghq.eu' },
+            { name: 'us1.prod.dog', site: 'datadoghq.com' },
+            { name: 'us3.prod.dog', site: 'us3.datadoghq.com' },
+            { name: 'us5.prod.dog', site: 'us5.datadoghq.com' },
+            { name: 'prtest00.prod.dog', site: 'prtest00.datadoghq.com' },
+            { name: 'prtest01.prod.dog', site: 'prtest01.datadoghq.com' },
+          ])
+        }
+
+        // don't push command details for the above mock commands
+        commands.push(commandDetail)
       },
     }
     return result

scripts/deploy/upload-source-maps.spec.ts

@@ -1,16 +1,9 @@
 import assert from 'node:assert/strict'
 import path from 'node:path'
 import { beforeEach, before, describe, it, mock } from 'node:test'
+import { getAllDatacenters, getSite } from '../lib/datacenter.ts'
 import { mockModule, mockCommandImplementation, replaceChunkHashes } from './lib/testHelpers.ts'
 
-const MOCK_SITES = [
-  'us1.datadoghq.com',
-  'eu1.datadoghq.eu',
-  'us3.datadoghq.com',
-  'us5.datadoghq.com',
-  'ap1.datadoghq.com',
-  'ap2.datadoghq.com',
-]
 const FAKE_API_KEY = 'FAKE_API_KEY'
 const ENV_STAGING = {
   DATADOG_API_KEY: FAKE_API_KEY,
@@ -57,8 +50,8 @@ describe('upload-source-maps', () => {
   })
 
   function forEachDatacenter(callback: (site: string) => void): void {
-    for (const site of MOCK_SITES) {
-      callback(site)
+    for (const datacenter of getAllDatacenters()) {
+      callback(getSite(datacenter))
     }
   }