Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Output container logs for Sample App CI (#67003)

Timofey Kachalov65316d089d1c
diff --git a/e2e/runner/embedding-sdk/sample-apps/helpers/get-logs-command.ts b/e2e/runner/embedding-sdk/sample-apps/helpers/get-logs-command.ts
new file mode 100644
index 00000000000..a28330b61e4
--- /dev/null
+++ b/e2e/runner/embedding-sdk/sample-apps/helpers/get-logs-command.ts
@@ -0,0 +1,9 @@
+export const getLogsCommand = (appName: string): string => {
+ if (!/^[a-zA-Z0-9-]+$/.test(appName)) {
+ throw new Error(
+ `Invalid appName: "${appName}". Only alphanumeric characters and hyphens are allowed.`,
+ );
+ }
+
+ return `for container in $(docker ps --filter "name=${appName}-" --format "{{.Names}}"); do docker logs "$container" 2>&1 | sed "s/^/[$container] /"; done`;
+};
diff --git a/e2e/runner/embedding-sdk/sample-apps/helpers/start-containers.ts b/e2e/runner/embedding-sdk/sample-apps/helpers/start-containers.ts
index 474d25af42f..650e2fa1968 100644
--- a/e2e/runner/embedding-sdk/sample-apps/helpers/start-containers.ts
+++ b/e2e/runner/embedding-sdk/sample-apps/helpers/start-containers.ts
@@ -1,15 +1,19 @@
import { shell } from "../../../cypress-runner-utils";
import { waitForHealth } from "../../shared/helpers/wait-for-health";
+import { getLogsCommand } from "./get-logs-command";
+
export async function startContainers({
cwd,
env,
+ appName,
dockerUpCommand,
dockerDownCommand,
healthcheckPorts,
}: {
cwd: string;
env: Record<string, string | number>;
+ appName: string;
dockerUpCommand: string;
dockerDownCommand: string;
healthcheckPorts: number[];
@@ -28,7 +32,10 @@ export async function startContainers({
});
await Promise.all(healthcheckPromises);
+
+ shell(getLogsCommand(appName));
} catch {
+ shell(getLogsCommand(appName));
shell(dockerDownCommand, { cwd, env });
}
}
diff --git a/e2e/runner/embedding-sdk/sample-apps/start-sample-app-containers.ts b/e2e/runner/embedding-sdk/sample-apps/start-sample-app-containers.ts
index 1c88c010e01..ad06105d503 100644
--- a/e2e/runner/embedding-sdk/sample-apps/start-sample-app-containers.ts
+++ b/e2e/runner/embedding-sdk/sample-apps/start-sample-app-containers.ts
@@ -71,6 +71,7 @@ export async function startSampleAppContainers(
await startContainers({
cwd: rootPath,
env,
+ appName,
dockerUpCommand,
dockerDownCommand,
healthcheckPorts,