dyrector-io · m8vago · Aug 31, 2023 · Jun 21, 2023 · Jun 22, 2023 · Jun 22, 2023
@@ -583,9 +583,10 @@ jobs:
         if: always()
         run: |
           mkdir logs
-          docker logs dyo-e2e_crux-ui > logs/e2e-crux-ui.log
-          docker logs dyo-e2e_crux > logs/e2e-crux.log
-          docker logs dyo-e2e_kratos > logs/e2e-kratos.log
+          docker logs dyo-e2e_crux-ui > logs/e2e-crux-ui.log 2>&1
+          docker logs dyo-e2e_crux > logs/e2e-crux.log 2>&1
+          docker logs dyo-e2e_kratos > logs/e2e-kratos.log 2>&1
+          docker logs dagent > logs/e2e-dagent.log 2>&1
       - uses: actions/upload-artifact@v3
         if: failure()
         with:

@@ -14,6 +14,7 @@ import { Locator, Page } from '@playwright/test'
 import path from 'path'
 import { v4 as uuid } from 'uuid'
 import MailSlurper from './mail-slurper'
+import { ChildProcess, ExecException, ExecOptions, exec } from 'child_process'
 
 export const MAILSLURPER_TIMEOUT = 30000 // millis
 export const USER_EMAIL = 'john.doe@example.com'
@@ -170,5 +171,39 @@ export const clearInput = async (input: Locator) => {
   await input.press('Backspace')
 }
 
-export const waitForURLExcept = (page: Page, options: { startsWith: string; except: string }) =>
-  page.waitForURL(it => it.toString() !== options.except && it.pathname.startsWith(options.startsWith))
+export const waitForURLExcept = async (page: Page, options: { startsWith: string; except: string }) =>
+  await page.waitForURL(it => it.toString() !== options.except && it.pathname.startsWith(options.startsWith))
+
+export const getExecOptions = (): ExecOptions =>
+  process.platform === 'win32'
+    ? {
+        shell: 'C:\\Program Files\\git\\bin\\bash.exe',
+      }
+    : null
+
+export const logCmdOutput = (logStdOut: boolean) => (err: Error, stdOut: string, stdErr: string) => {
+  if (logStdOut) {
+    console.info(stdOut)
+  }
+
+  if (err) {
+    console.error(err)
+  }
+
+  if (stdErr) {
+    console.error(stdErr)
+  }
+}
+
+export const execAsync = (
+  command: string,
+  options: ExecOptions,
+  callback?: (error: ExecException | null, stdout: string, stderr: string) => void,
+) => {
+  return new Promise<ChildProcess>(resolve => {
+    const childProcess = exec(command, options, (error: ExecException | null, stdout: string, stderr: string) => {
+      callback?.call(null, error, stdout, stderr)
+      resolve(childProcess)
+    })
+  })
+}
@@ -1,9 +1,9 @@
 import { TEAM_ROUTES } from './common'
 import { Page, expect } from '@playwright/test'
-import { waitSocket, wsPatchSent } from './websocket'
+import { waitSocketRef, wsPatchSent } from './websocket'
 import { PatchConfigBundleMessage, WS_TYPE_PATCH_CONFIG_BUNDLE } from '@app/models/config-bundle'
 
-const matchPatchEnvironment = (expected: Record<string, string>) => (message: PatchConfigBundleMessage) => 
+const matchPatchEnvironment = (expected: Record<string, string>) => (message: PatchConfigBundleMessage) =>
   Object.entries(expected).every(
     ([key, value]) => message.environment?.find(it => it.key === key && it.value === value),
   )
@@ -16,7 +16,7 @@ export const createConfigBundle = async (page: Page, name: string, data: Record<
   await expect(page.locator('h4')).toContainText('New config bundle')
   await page.locator('input[name=name] >> visible=true').fill(name)
 
-  const sock = waitSocket(page)
+  const sock = waitSocketRef(page)
   await page.locator('text=Save').click()
   await page.waitForURL(`${TEAM_ROUTES.configBundles.list()}/**`)
   await page.waitForSelector(`h4:text-is("View ${name}")`)
@@ -28,7 +28,7 @@ export const createConfigBundle = async (page: Page, name: string, data: Record<
 
   await page.locator('button:has-text("Edit")').click()
 
-  const wsPatchReceived = wsPatchSent(ws, wsRoute, matchPatchEnvironment(data), WS_TYPE_PATCH_CONFIG_BUNDLE)
+  const wsPatchReceived = wsPatchSent(ws, wsRoute, WS_TYPE_PATCH_CONFIG_BUNDLE, matchPatchEnvironment(data))
 
   const entries = Object.entries(data)
   for (let i = 0; i < entries.length; i++) {

@@ -0,0 +1,28 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { expect, Page } from '@playwright/test'
+import { WebSocketRef, wsPatchSent } from './websocket'
+import { wsPatchMatchPorts } from './websocket-match'
+
+export const addPortsToContainerConfig = async (
+  page: Page,
+  ws: WebSocketRef,
+  wsRoute: string,
+  sentWsType: string,
+  internal: string,
+  external: string,
+) => {
+  await page.locator('button:has-text("JSON")').click()
+
+  const jsonEditor = await page.locator('textarea')
+  const json = JSON.parse(await jsonEditor.inputValue())
+  json.ports = [{ internal: Number.parseInt(internal, 10), external: Number.parseInt(external, 10) }]
+
+  let wsSent = wsPatchSent(ws, wsRoute, sentWsType, wsPatchMatchPorts(internal, external))
+  await jsonEditor.fill(JSON.stringify(json))
+  await wsSent
+
+  await page.reload()
+
+  await expect(page.locator('input[placeholder="Internal"]')).toHaveValue(internal)
+  await expect(page.locator('input[placeholder="External"]')).toHaveValue(external)
+}
@@ -1,6 +1,6 @@
 /* eslint-disable import/no-extraneous-dependencies */
 import { ROUTE_LOGIN, ROUTE_TEAMS_CREATE } from '@app/routes'
-import { test } from '@playwright/test'
+import { test } from './test.fixture'
 import { BASE_URL, STORAGE_STATE } from '../../playwright.config'
 import {
   createUser,
@@ -29,30 +29,36 @@ test('global setup', async ({ page }) => {
 
   logInfo('logging in')
   await page.goto(ROUTE_LOGIN)
+  await page.waitForSelector('h1:text-is("Log in")')
   await page.locator('input[name=email]').fill(USER_EMAIL)
   await page.locator('input[name=password]').fill(USER_PASSWORD)
   await page.locator('button[type=submit]').click()
 
   logInfo('creating team')
   await page.waitForURL(ROUTE_TEAMS_CREATE)
+  await page.waitForSelector('h4:text-is("Create new team")')
   await page.locator('input[name=name]').fill(USER_TEAM)
   await page.locator('input[name=slug]').fill(USER_TEAM_SLUG)
   await page.locator('button[type=submit]').click()
 
   await page.waitForURL(TEAM_ROUTES.dashboard.index())
+  await page.waitForSelector('h2:text-is("Dashboard")')
 
   logInfo('saving storage state')
   await page.context().storageState({ path: STORAGE_STATE as string })
 
   logInfo('changing registry to ghcr')
   await page.goto(TEAM_ROUTES.registry.list())
+  await page.waitForSelector('h2:text-is("Registries")')
   await page.click('h3:has-text("Docker Hub Library")')
   await page.waitForURL(`${TEAM_ROUTES.registry.list()}/**`)
+  await page.waitForSelector('h3:text-is("Docker Hub Library")')
   await page.click('button:has-text("Edit")')
   await page.click('button:has-text("Unchecked")')
   await page.locator('input[name=name]').fill(REGISTRY_NAME)
   await page.locator('input[name=url]').fill(GHCR_MIRROR)
   await page.click('button:has-text("Save")')
+  await page.waitForSelector(`h3:text-is("${REGISTRY_NAME}")`)
 
   logInfo('installing dagent')
   await installDagent(page)

@@ -1,4 +1,4 @@
-import { test } from '@playwright/test'
+import { test } from './test.fixture'
 import { globalTeardown } from './global.teardown'
 
 test('teardown', async () => {

@@ -1,4 +1,4 @@
-import { exec, ExecOptions } from 'child_process'
+import { exec, ExecOptions, execSync } from 'child_process'
 /* eslint-disable import/no-extraneous-dependencies */
 import { internalError } from '@app/error-responses'
 import { UserMeta } from '@app/models'
@@ -8,10 +8,13 @@ import { BASE_URL } from '../../playwright.config'
 import {
   cruxUrlFromEnv,
   deleteUserByEmail,
+  execAsync,
+  getExecOptions,
   getUserByEmail,
   getUserSessionToken,
   kratosFromConfig,
   kratosFrontendFromConfig,
+  logCmdOutput,
   USER_EMAIL,
 } from './common'
 
@@ -84,15 +87,19 @@ export const globalTeardown = async () => {
   logInfo('fetch', 'delete user')
   await deleteUserByEmail(kratos, USER_EMAIL)
 
-  const settings: ExecOptions =
-    process.platform === 'win32'
-      ? {
-          shell: 'C:\\Program Files\\git\\git-bash.exe',
-        }
-      : null
+  const settings = getExecOptions()
 
   logInfo('docker', 'remove stack')
 
-  exec(`docker rm -f $(docker ps -a -q --filter "name=^pw")`, settings)
-  exec('docker rm -f dagent', settings)
+  await execAsync(`docker rm -f $(docker ps -a -q --filter "name=^pw")`, settings)
+
+  if (!process.env.CI) {
+    // When running in CI a pipeline step will gather the dagent logs
+    const dagentInspect = await execAsync('docker inspect dagent', settings)
+    if (dagentInspect.exitCode === 0) {
+      logInfo('Saved dagent logs to ./e2e_results/dagent.log')
+      await execAsync('docker logs dagent > ./e2e_results/dagent.log 2>&1', settings, logCmdOutput(true))
+    }
+    await execAsync('docker rm -f dagent', settings)
+  }
 }
@@ -1,11 +1,13 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { expect, test, Page } from '@playwright/test'
-import { exec, ExecOptions } from 'child_process'
-import { DAGENT_NODE, screenshotPath, TEAM_ROUTES } from './common'
+import { expect, Page } from '@playwright/test'
+import { ExecOptions } from 'child_process'
+import { DAGENT_NODE, execAsync, getExecOptions, logCmdOutput, screenshotPath, TEAM_ROUTES } from './common'
 import { fillDeploymentPrefix } from './projects'
+import { Readable } from 'stream'
 
 export const installDagent = async (page: Page) => {
  await page.goto(TEAM_ROUTES.node.list())
+  await page.waitForSelector('h2:text-is("Nodes")')
 
   await page.locator('button:has-text("Add")').click()
 
@@ -25,10 +27,17 @@ export const installDagent = async (page: Page) => {
   const commandInput = await page.locator('input[readonly]')
   const curl = await commandInput.inputValue()
 
+  const installOutput: string[] = []
   // eslint-disable-next-line @typescript-eslint/no-use-before-define
-  exec(curl, getInstallScriptExecSettings(), logCmdOutput)
-
-  await page.waitForSelector('div.bg-dyo-green')
+  await execAsync(curl, getInstallScriptExecSettings(), storeCmdOutput(installOutput))
+
+  try {
+    await page.waitForSelector('div.bg-dyo-green')
+  } catch (err) {
+    console.log('[E2E] Agent install failed, script output:')
+    installOutput.forEach(it => console.log(it))
+    throw err
+  }
 
   await page.screenshot({ path: screenshotPath('node-dagent-install-successful'), fullPage: true })
 }
@@ -52,8 +61,10 @@ export const deployWithDagent = async (
 ): Promise<string> => {
   if (versionId) {
     await page.goto(TEAM_ROUTES.project.versions(projectId).details(versionId))
+    await page.waitForSelector('h2:text-is("Versions")')
   } else {
     await page.goto(TEAM_ROUTES.project.details(projectId))
+    await page.waitForSelector('h2:text-is("Projects")')
   }
 
   await page.locator('button:has-text("Add deployment")').click()
@@ -100,6 +111,7 @@ export const deploy = async (
 ): Promise<string> => {
   if (navigate !== false) {
     await page.goto(TEAM_ROUTES.deployment.details(deploymentId))
+    await page.waitForSelector('h2:text-is("Deployments")')
   }
 
   const deploy = page.getByText('Deploy', {
@@ -108,6 +120,7 @@ export const deploy = async (
 
   await deploy.click()
   await page.waitForURL(TEAM_ROUTES.deployment.deploy(deploymentId))
+  await page.waitForLoadState('networkidle')
 
   if (ignoreResult) {
     return deploymentId
@@ -120,33 +133,27 @@ export const deploy = async (
   return deploymentId
 }
 
-const logCmdOutput = (err: Error, stdOut: string, stdErr: string, logStdOut?: boolean) => {
-  if (logStdOut) {
-    console.info(stdOut)
-  }
+const getInstallScriptExecSettings = (): ExecOptions => ({
+  ...getExecOptions(),
+  ...(process.platform === 'darwin'
+    ? {
+        env: { ...process.env },
+      }
+    : process.platform === 'win32'
+    ? null
+    : {
+        env: { ...process.env, ROOTLESS: 'true', PERSISTENCE_FOLDER: `${__dirname}/dagent` },
+      }),
+})
+
+export const storeCmdOutput = (storage: string[]) => (err: Error, stdOut: string, stdErr: string) => {
+  storage.push(stdOut)
 
   if (err) {
-    console.error(err)
+    storage.push(`${err.message} at ${err.stack}`)
   }
 
   if (stdErr) {
-    console.error(stdErr)
-  }
-}
-
-const getInstallScriptExecSettings = (): ExecOptions => {
-  switch (process.platform) {
-    case 'darwin':
-      return {
-        env: { ...process.env },
-      }
-    case 'win32':
-      return {
-        shell: 'C:\\Program Files\\git\\git-bash.exe',
-      }
-    default:
-      return {
-        env: { ...process.env, ROOTLESS: 'true', PERSISTENCE_FOLDER: `${__dirname}/dagent` },
-      }
+    storage.push(stdErr)
   }
 }
@@ -5,6 +5,7 @@ import { TEAM_ROUTES } from './common'
 // eslint-disable-next-line import/prefer-default-export
 export const createNode = async (page: Page, name: string) => {
   await page.goto(TEAM_ROUTES.node.list())
+  await page.waitForSelector('h2:text-is("Nodes")')
 
   await page.locator('button:has-text("Add")').click()
   await expect(page.locator('h4:has-text("New node")')).toHaveCount(1)