Skip to content

test(e2e): Avoid SAM runtime port collisions in aws-serverless tests #24492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
msonnb wants to merge 1 commit into
base: develop
Choose a base branch
from
+12 −10
Open

test(e2e): Avoid SAM runtime port collisions in aws-serverless tests #24492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions dev-packages/e2e-tests/test-applications/aws-serverless-layer/src/stack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import { globSync } from 'glob';
const LAMBDA_FUNCTIONS_DIR = './src/lambda-functions-layer';
const LAMBDA_FUNCTION_TIMEOUT = 10;
const LAYER_DIR = './node_modules/@sentry/aws-serverless/';
export const SAM_PORT = Number(process.env.SAM_PORT) || 7120;
// SAM allocates runtime container ports in [5000, 9000) before binding its own endpoint.
export const SAM_PORT = Number(process.env.SAM_PORT) || 17120;

/** Match SAM / Docker to this machine so Apple Silicon does not mix arm64 images with an x86_64 template default. */
function samLambdaArchitecture(): 'arm64' | 'x86_64' {
Expand Down Expand Up @@ -102,13 +103,13 @@ export class LocalLambdaStack extends Stack {
try {
const response = await fetch(`http://127.0.0.1:${port}/`);

if (response.ok || response.status === 404) {
if (response.status === 404 && response.headers.get('x-amzn-errortype') === 'PathNotFoundLocally') {
console.log(`[LocalLambdaStack] SAM stack is ready`);
return;
}
} catch {
await new Promise(resolve => setTimeout(resolve, 1000));
}
} catch {}

await new Promise(resolve => setTimeout(resolve, 1000));
}

throw new Error(`[LocalLambdaStack] Failed to start SAM stack after ${timeout}ms`);
Expand Down
11 changes: 6 additions & 5 deletions dev-packages/e2e-tests/test-applications/aws-serverless/src/stack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import { execFileSync } from 'node:child_process';

const LAMBDA_FUNCTIONS_DIR = './src/lambda-functions-npm';
const LAMBDA_FUNCTION_TIMEOUT = 10;
export const SAM_PORT = Number(process.env.SAM_PORT) || 7120;
// SAM allocates runtime container ports in [5000, 9000) before binding its own endpoint.
export const SAM_PORT = Number(process.env.SAM_PORT) || 17120;

/** Match SAM / Docker to this machine so Apple Silicon does not mix arm64 images with an x86_64 template default. */
function samLambdaArchitecture(): 'arm64' | 'x86_64' {
Expand Down Expand Up @@ -143,13 +144,13 @@ export class LocalLambdaStack extends Stack {
try {
const response = await fetch(`http://127.0.0.1:${port}/`);

if (response.ok || response.status === 404) {
if (response.status === 404 && response.headers.get('x-amzn-errortype') === 'PathNotFoundLocally') {
console.log(`[LocalLambdaStack] SAM stack is ready`);
return;
}
} catch {
await new Promise(resolve => setTimeout(resolve, 1000));
}
} catch {}

await new Promise(resolve => setTimeout(resolve, 1000));
}

throw new Error(`[LocalLambdaStack] Failed to start SAM stack after ${timeout}ms`);
Expand Down
Loading